Adding date filter to GetNodesCounts API

api/external/cfgmgmt/request/stats.proto

@@ -6,6 +6,10 @@ option go_package = "github.com/chef/automate/api/external/cfgmgmt/request";
 message NodesCounts {
   // List of filters to be applied to the node count results.
   repeated string filter = 1;
+  // Earliest node check-in.
+  string start = 2;
+  // Latest node check-in
+  string end = 3;
 }
 
 message RunsCounts {

api/interservice/cfgmgmt/request/stats.proto

@@ -5,6 +5,8 @@ option go_package = "github.com/chef/automate/api/interservice/cfgmgmt/request";
 
 message NodesCounts {
   repeated string filter = 1;
+  string start = 2;
+  string end = 3;
 }
 
 message RunsCounts {

components/automate-gateway/handler/cfgmgmt.go

@@ -224,6 +224,8 @@ func (s *CfgMgmtServer) GetNodesCounts(ctx context.Context, request *cfgReq.Node
 
 	cfgMgmtRequest := &cmsReq.NodesCounts{
 		Filter: request.Filter,
+		Start:  request.Start,
+		End:    request.End,
 	}
 
 	cfgmgmtNodesCounts, err := s.cfgMgmtClient.GetNodesCounts(ctx, cfgMgmtRequest)

components/config-mgmt-service/backend/client.go

@@ -21,8 +21,8 @@ type Client interface {
 	NodeExists(nodeID string, projectFilters map[string][]string) (bool, error)
 	// @params (page, perPage, sortField, ascending, filters, startDate, endDate)
 	GetNodes(int, int, string, bool, map[string][]string, string, string) ([]Node, error)
-	// @params (filters)
-	GetNodesCounts(map[string][]string) (NodesCounts, error)
+	// @params (filters, startDate, endDate)
+	GetNodesCounts(map[string][]string, string, string) (NodesCounts, error)
 	// @params (node_id, page, per_page, filters, start, end)
 	GetRuns(string, int, int, map[string][]string, string, string) ([]AbridgedConverge, error)
 	// @params (filters nodeID start end)

components/config-mgmt-service/backend/elastic/nodes.go

@@ -238,19 +238,26 @@ func (es Backend) GetNodes(page int, perPage int, sortField string,
 }
 
 // GetNodesCounts - get the number of successful, failure, and missing nodes
-func (es Backend) GetNodesCounts(filters map[string][]string) (backend.NodesCounts, error) {
+func (es Backend) GetNodesCounts(filters map[string][]string,
+	startDate string, endDate string) (backend.NodesCounts, error) {
 	var ns = *new(backend.NodesCounts)
 
 	// Adding the exists = true filter to the list of filters, because nodes
 	// have documents that persist in elasticsearch to hold historical data
 	// even after the node no longer exists
 	filters["exists"] = []string{"true"}
 
-	boolQuery := newBoolQueryFromFilters(filters)
+	mainQuery := newBoolQueryFromFilters(filters)
+
+	rangeQuery, ok := newRangeQuery(startDate, endDate, NodeCheckin)
+
+	if ok {
+		mainQuery = mainQuery.Must(rangeQuery)
+	}
 
 	searchTerm := "status"
 
-	statusNodesBuckets, err := es.getAggregationBucket(boolQuery, IndexNodeState, searchTerm)
+	statusNodesBuckets, err := es.getAggregationBucket(mainQuery, IndexNodeState, searchTerm)
 	if err != nil {
 		return ns, err
 	}

components/config-mgmt-service/backend/mock/mock.go

@@ -37,7 +37,8 @@ func (m Backend) NodeExists(id string, filters map[string][]string) (bool, error
 	return false, nil
 }
 
-func (m Backend) GetNodesCounts(filters map[string][]string) (backend.NodesCounts, error) {
+func (m Backend) GetNodesCounts(filters map[string][]string,
+	startDate string, endDate string) (backend.NodesCounts, error) {
 	ns := backend.NodesCounts{}
 	return ns, nil
 }

components/config-mgmt-service/backend/mock/mock_test.go

@@ -34,7 +34,7 @@ func TestNodeExists(t *testing.T) {
 func TestGetNodesCounts(t *testing.T) {
 	expected := *new(backend.NodesCounts)
 	filterMap := make(map[string][]string)
-	nodeState, err := subject.New().GetNodesCounts(filterMap)
+	nodeState, err := subject.New().GetNodesCounts(filterMap, "", "")
 	assert.Nil(t, err)
 	assert.Equal(t, nodeState, expected)
 }

components/config-mgmt-service/grpcserver/cfg_mgmt.go

@@ -106,12 +106,18 @@ func (s *CfgMgmtServer) GetNodesCounts(ctx context.Context,
 		return nodesCounts, errors.GrpcErrorFromErr(codes.InvalidArgument, err)
 	}
 
+	// Date Range
+	if !params.ValidateDateTimeRange(request.GetStart(), request.GetEnd()) {
+		return nodesCounts, status.Errorf(codes.InvalidArgument,
+			"Invalid start/end time. (format: YYYY-MM-DD'T'HH:mm:ssZ)")
+	}
+
 	filters, err = filterByProjects(ctx, filters)
 	if err != nil {
 		return nodesCounts, errors.GrpcErrorFromErr(codes.Internal, err)
 	}
 
-	state, err := s.client.GetNodesCounts(filters)
+	state, err := s.client.GetNodesCounts(filters, request.GetStart(), request.GetEnd())
 	if err != nil {
 		return nodesCounts, errors.GrpcErrorFromErr(codes.Internal, err)
 	}