From 6af356a2fd324665da0c0be6f0c19007d74056db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
Date: Tue, 6 Oct 2015 10:42:32 +0200
Subject: [PATCH 1/2] Use pypuppetdb with api version 4

---
 puppetboard/app.py | 9 ++++-----
 requirements.txt   | 2 +-
 setup.py           | 3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/puppetboard/app.py b/puppetboard/app.py
index 92ea0e5..29fe40a 100644
--- a/puppetboard/app.py
+++ b/puppetboard/app.py
@@ -37,7 +37,6 @@ app.secret_key = app.config['SECRET_KEY']
 app.jinja_env.filters['jsonprint'] = jsonprint
 
 puppetdb = connect(
-    api_version=3,
     host=app.config['PUPPETDB_HOST'],
     port=app.config['PUPPETDB_PORT'],
     ssl_verify=app.config['PUPPETDB_SSL_VERIFY'],
@@ -102,7 +101,7 @@ def index():
     """
     # TODO: Would be great if we could parallelize this somehow, doing these
     # requests in sequence is rather pointless.
-    prefix = 'com.puppetlabs.puppetdb.query.population'
+    prefix = 'puppetlabs.puppetdb.query.population'
     num_nodes = get_or_abort(
         puppetdb.metric,
         "{0}{1}".format(prefix, ':type=default,name=num-nodes'))
@@ -272,7 +271,7 @@ def reports_node(node_name):
     a table displaying those reports."""
     reports = limit_reports(
         yield_or_stop(
-            puppetdb.reports('["=", "certname", "{0}"]'.format(node_name))),
+            puppetdb.reports(query='["=", "certname", "{0}"]'.format(node_name))),
         app.config['REPORTS_COUNT'])
     return render_template(
         'reports_node.html',
@@ -307,11 +306,11 @@ def report(node_name, report_id):
     configuration_version. This allows for better integration
     into puppet-hipchat.
     """
-    reports = puppetdb.reports('["=", "certname", "{0}"]'.format(node_name))
+    reports = puppetdb.reports(query='["=", "certname", "{0}"]'.format(node_name))
 
     for report in reports:
         if report.hash_ == report_id or report.version == report_id:
-            events = puppetdb.events('["=", "report", "{0}"]'.format(
+            events = puppetdb.events(query='["=", "report", "{0}"]'.format(
                 report.hash_))
             return render_template(
                 'report.html',
diff --git a/requirements.txt b/requirements.txt
index f9f044a..7ae3fa7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,5 @@ MarkupSafe==0.19
 WTForms==1.0.5
 Werkzeug==0.9.4
 itsdangerous==0.23
-pypuppetdb==0.1.1
+git+https://github.com/raphink/pypuppetdb@v4-api#egg=pypuppetdb-0.1.0
 requests==2.2.1
diff --git a/setup.py b/setup.py
index c7cf0ee..f75874c 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,8 @@ setup(
         "Flask >= 0.10.1",
         "Flask-WTF >= 0.9.4, <= 0.9.5",
         "WTForms < 2.0",
-        "pypuppetdb >= 0.1.0, < 0.2.0",
+    dependency_links=[
+        "git+https://github.com/raphink/pypuppetdb@v4-api#egg=pypuppetdb",
         ],
     keywords="puppet puppetdb puppetboard",
     classifiers=[

From b539fc9475498e7a5b3a5cf8c33078c5377c8e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?=
 <mickael.canevet@camptocamp.com>
Date: Sun, 25 Oct 2015 09:52:42 +0100
Subject: [PATCH 2/2] Fix dependencies now that pypuppetdb 0.2.0 is released

---
 requirements.txt | 2 +-
 setup.py         | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7ae3fa7..cc8a991 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,5 @@ MarkupSafe==0.19
 WTForms==1.0.5
 Werkzeug==0.9.4
 itsdangerous==0.23
-git+https://github.com/raphink/pypuppetdb@v4-api#egg=pypuppetdb-0.1.0
+pypuppetdb==0.2.0
 requests==2.2.1
diff --git a/setup.py b/setup.py
index f75874c..bb23be7 100644
--- a/setup.py
+++ b/setup.py
@@ -32,8 +32,7 @@ setup(
         "Flask >= 0.10.1",
         "Flask-WTF >= 0.9.4, <= 0.9.5",
         "WTForms < 2.0",
-    dependency_links=[
-        "git+https://github.com/raphink/pypuppetdb@v4-api#egg=pypuppetdb",
+        "pypuppetdb >= 0.2.0, < 0.3.0",
         ],
     keywords="puppet puppetdb puppetboard",
     classifiers=[