From fe4852d8179d6abcdf9763c68afbef2eb340dc46 Mon Sep 17 00:00:00 2001
From: William Brown <firstyear@redhat.com>
Date: Jan 09 2017 23:08:46 +0000
Subject: Updates to use new lib389 apis


Fix Description:  Update parts of the rest code to work with the new lib389
apis.

Author: wibrown

---

diff --git a/rest389-debugserver.py b/rest389-debugserver.py
index f1c7d65..c9056b2 100644
--- a/rest389-debugserver.py
+++ b/rest389-debugserver.py
@@ -5,4 +5,4 @@ from rest389 import rest389app as app
 
 if __name__ == '__main__':
     # THIS IS REALLY DANGEROUS, AND ALLOWS RCE. ONLY USE IN DEVELOPMENT
-    app.run(debug=True, host='0.0.0.0')
+    app.run(debug=True, host='0.0.0.0', port=8000)
diff --git a/rest389/MonitorResource.py b/rest389/MonitorResource.py
index 1fdc723..7003773 100644
--- a/rest389/MonitorResource.py
+++ b/rest389/MonitorResource.py
@@ -29,9 +29,27 @@ def monitor(ds):
         return jsonResponse("", 200, request.url)
 
     elif request.method == 'GET':
-        status = ds.monitor.server()
+        status = ds.monitor.status_json()
         return jsonResponse(status, 200, request.url)
 
+@monitor_api.route('/v1/monitor/ldbm', methods=['GET', 'HEAD', 'OPTIONS'])
+@authenticateConnection
+def monitor_ldbm(ds):
+
+    if request.method == 'OPTIONS':
+        msg = {}
+        msg['allow'] = 'GET OPTIONS HEAD'
+        return jsonify(msg)
+
+    elif request.method == 'HEAD':
+        # Probably should be checking if it exists here ...
+        return jsonResponse("", 200, request.url)
+
+    elif request.method == 'GET':
+        status = ds.monitorldbm.status_json()
+        return jsonResponse(status, 200, request.url)
+
+
 # We might make a suffix monitor later, so we leave the namespace clean.
 
 @monitor_api.route('/v1/monitor/backend', methods=['GET', 'HEAD', 'OPTIONS'])
@@ -49,7 +67,12 @@ def monitor_backends(ds):
         return jsonResponse("", 200, request.url)
 
     elif request.method == 'GET':
-        status = ds.monitor.backends()
+        # Get all the backends
+        bes = ds.backends.list()
+        # for each, show the monitor?
+        status = {}
+        for be in bes:
+            status[be.rdn] = be.get_monitor().status_json()
         print(status)
         return jsonResponse(status, 200, request.url)
 
@@ -69,7 +92,8 @@ def monitor_backend(ds, backend):
         return jsonResponse("", 200, request.url)
 
     elif request.method == 'GET':
-        status = ds.monitor.backend(backend)
+        be = ds.backends.get(backend)
+        status = be.get_monitor().status_json()
         print(status)
         return jsonResponse(status, 200, request.url)
 
diff --git a/rest389/templates/perfmon.html b/rest389/templates/perfmon.html
index 18585a0..1114381 100644
--- a/rest389/templates/perfmon.html
+++ b/rest389/templates/perfmon.html
@@ -53,43 +53,41 @@
     </ul>
     <script>
 
-    function db_perf(backend) {
-        //console.log(backend);
-        var chart_name = 'db_perf_chart_' + backend;
-        var details = $.ajax({
-            dataType: "json",
-            url: "/v1/monitor/backend/" + backend,
-            success: function(data) {
-                //console.log(data.result);
-                // We want to make a few graphs here I suspect.
-                var columns = ['Number',
-                               data.result.dncachehitratio[0],
-                               data.result.entrycachehitratio[0],
-                               data.result.normalizeddncachehitratio[0]
-                              ];
-                var categories = ['DN Cache Hit Ratio', 'Entry Cache Hit Ratio', 'Normalised DN Cache Hit Ratio'];
-                generate_db_perf_graph(chart_name, columns, categories);
-            } // success function
-        }); //end ajax
-    }
+      function db_perf(backend) {
+         //console.log(backend);
+         var chart_name = 'db_perf_chart_' + backend;
+         var details = $.ajax({
+             dataType: "json",
+             url: "/v1/monitor/backend/" + backend,
+             success: function(data) {
+                 console.log(data.result);
+                 // We want to make a few graphs here I suspect.
+                 var columns = ['Number',
+                                data.result.attrs.dncachehitratio[0],
+                                data.result.attrs.entrycachehitratio[0],
+                                data.result.attrs.normalizeddncachehitratio[0]
+                               ];
+                 var categories = ['DN Cache Hit Ratio', 'Entry Cache Hit Ratio', 'Normalised DN Cache Hit Ratio'];
+                 generate_db_perf_graph(chart_name, columns, categories);
+             } // success function
+         }); //end ajax
+     }
 
       var db_details = $.ajax({
         dataType: "json",
         url: "/v1/monitor",
         success: function(data) {
-            //console.log(data.result);
-            $('#ds_version').text(data.result.version[0]);
-            $('#ds_currenttime').text(data.result.currenttime[0]);
-            generate_ds_perf_graph(parseInt(data.result.threads[0]),
-                              parseInt(data.result.currentconnections[0]),
-                              parseInt(data.result.opsinitiated) - parseInt(data.result.completed)
+            console.log(data.result.attrs);
+            $('#ds_version').text(data.result.attrs.version[0]);
+            $('#ds_currenttime').text(data.result.attrs.currenttime[0]);
+            generate_ds_perf_graph(parseInt(data.result.attrs.threads[0]),
+                              parseInt(data.result.attrs.currentconnections[0]),
+                              parseInt(data.result.attrs.opsinitiated) - parseInt(data.result.attrs.completed)
                                 ); //end gen c3 graph
 
-            generate_ds_db_cachehitratio_graph(parseInt(data.result.dbcachehitratio,[0])
-                                ); //end gen c3 graph
-            for (conn in data.result.connection) {
+            for (conn in data.result.attrs.connection) {
                 var update = "<tr><td>";
-                update += data.result.connection[conn];
+                update += data.result.attrs.connection[conn];
                 update += "</td></tr>";
                 $("#connection_table tr:last").after(update);
             } // end for
@@ -98,11 +96,21 @@
 
       var be_details = $.ajax({
         dataType: "json",
+        url: "/v1/monitor/ldbm",
+        success: function(data) {
+            generate_ds_db_cachehitratio_graph(parseInt(data.result.attrs.dbcachehitratio,[0])
+                                ); //end gen c3 graph
+        } //success function
+      }); // End ajax
+
+      var be_details = $.ajax({
+        dataType: "json",
         url: "/v1/monitor/backend",
         success: function(data) {
             keys = Object.keys(data.result);
             for (keyi in keys) {
                 var backend = keys[keyi];
+                console.log(backend);
                 var update = "<tr><td>";
                 update += backend;
                 update += "</td><td>";
diff --git a/setup.py b/setup.py
index a660bff..df92e79 100644
--- a/setup.py
+++ b/setup.py
@@ -76,8 +76,9 @@ setup(
         'rest389.wsgi',
     ]},
     data_files=[
-        ('/usr/share/rest389/examples/', ['examples/rest389_httpd.conf', 'examples/ds-setup-rest-admin.inf']),
+        ('/usr/share/rest389/examples/', ['examples/ds-setup-rest-admin.inf']),
         ('/usr/sbin/', ['cli/ds-rest-setup']),
+        ('/etc/httpd/conf.d/', ['config/rest389_httpd.conf']),
     ],
     install_requires=['python-ldap', 'python-lib389', 'flask'],
 )