Make ES queries work

tim-group · Mar 29, 2013 · d4d707a · d4d707a
1 parent 0f3af72
commit d4d707a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/app/js/app.js b/app/js/app.js
@@ -6,6 +6,6 @@ angular.module('norman', []).
   config(['$routeProvider', function($routeProvider) {
   $routeProvider.
       when('/latest', {templateUrl: 'partials/report-latest.html',   controller: ReportListCtrl}).
-      when('/report/:uuid', {templateUrl: 'partials/report-detail.html', controller: ReportDetailCtrl}).
+      when('/report/:index/:uuid', {templateUrl: 'partials/report-detail.html', controller: ReportDetailCtrl}).
       otherwise({redirectTo: '/latest'});
 }]);
diff --git a/app/js/controllers.js b/app/js/controllers.js
@@ -8,9 +8,7 @@ function cleanData(data) {
 }
 
 function ReportListCtrl($scope, $http) {
-  $http.get('data/reports_latest.json').success(function(data) {
+  $http.post('/es/_all/puppet-apply/_search', angular.toJson({
-  $http.post('/es/_all/puppet-apply/_search', '
-{
    "from" : 0, "size" : 100,
    "query": {
       "term": {
@@ -20,15 +18,14 @@ function ReportListCtrl($scope, $http) {
    "sort" : [
         { "@timestamp" : {"order" : "desc"} }
    ]
-}').success(function(data) {
+})).success(function(data) {
-    d = []
+    var d = []
-    data['hits']['hits'].foreach(function(hit) {
+    data['hits']['hits'].forEach(function(hit) {
-        alert(hit);
+        hit["_source"]["uuid"] = hit["_index"].concat("/").concat(hit["_id"]);
-        d.push(hit);
+        d.push(hit["_source"]);
     })
-    $scope.reports = cleanData(data);
+    $scope.reports = cleanData(d);
   });
-
   $scope.orderProp = 'age';
 }
 
@@ -37,8 +34,14 @@ function ReportListCtrl($scope, $http) {
 
 function ReportDetailCtrl($scope, $routeParams, $http) {
   $scope.uuid = $routeParams.uuid;
+<<<<<<< HEAD
   $http.get('data/' + $routeParams.uuid + '.json').success(function(data) {
     $scope.report = cleanData(data);
+=======
+  $http.get('/es/' + $routeParams.index + '/puppet-apply/' + $routeParams.uuid).success(function(data) {
+    var jsonStringWithoutEvilAtSigns = angular.toJson(data["_source"]).replace(/@/g, "");
+    $scope.report = angular.fromJson(jsonStringWithoutEvilAtSigns);
+>>>>>>> Make ES queries work
   });
 }