elastic · ruflin · Jun 25, 2020 · ruflin · Jun 25, 2020 · ruflin
diff --git a/dev/import-beats/datasources.go b/dev/import-beats/datasources.go
@@ -181,6 +181,7 @@ func toDatasourceInputDescription(moduleTitle, packageType string, datasets []st
 func adjustDatasetNamesForInputDescription(names []string) []string {
 	var adjusted []string
 	for _, name := range names {
+		// TODO: need to investigate
 		if name == "log" {
 			adjusted = append(adjusted, "application")
 			continue

diff --git a/dev/import-beats/streams.go b/dev/import-beats/streams.go
@@ -92,7 +92,7 @@ func createLogStreams(modulePath, moduleTitle, datasetName string) ([]util.Strea
 		for _, inputType := range root.inputTypes() {
 			aType := inputType
 			if inputType == "log" {
-				aType = "logs"
+				aType = "logfile"
 			}
 			targetFileName := inputType + ".yml.hbs"
 

diff --git a/dev/import-beats/streams_config_parser.go b/dev/import-beats/streams_config_parser.go
@@ -90,6 +90,7 @@ func inputTypesForListNode(listNode *parse.ListNode) []string {
 }
 
 func (scp *streamConfigParsed) configForInput(inputType string) []byte {
+	// TODO: need to investigate
 	if inputType == "log" {
 		inputType = "file"
 	}

diff --git a/packages/aws/dataset/cloudtrail/manifest.yml b/packages/aws/dataset/cloudtrail/manifest.yml
@@ -1,6 +1,6 @@
 title: AWS CloudTrail logs
 release: beta
-type: logs
+type: logfile
 streams:
 - input: s3
   template_path: s3.yml.hbs

diff --git a/packages/aws/dataset/cloudwatch_logs/manifest.yml b/packages/aws/dataset/cloudwatch_logs/manifest.yml
@@ -1,6 +1,6 @@
 title: AWS CloudWatch logs
 release: beta
-type: logs
+type: logfile
 streams:
 - input: s3
   template_path: s3.yml.hbs

diff --git a/packages/aws/dataset/ec2_logs/manifest.yml b/packages/aws/dataset/ec2_logs/manifest.yml
@@ -1,6 +1,6 @@
 title: AWS EC2 logs
 release: beta
-type: logs
+type: logfile
 streams:
 - input: s3
   template_path: s3.yml.hbs

diff --git a/packages/aws/dataset/elb_logs/manifest.yml b/packages/aws/dataset/elb_logs/manifest.yml
@@ -1,6 +1,6 @@
 title: AWS ELB logs
 release: beta
-type: logs
+type: logfile
 streams:
 - input: s3
   template_path: s3.yml.hbs

diff --git a/packages/aws/dataset/s3access/manifest.yml b/packages/aws/dataset/s3access/manifest.yml
@@ -1,6 +1,6 @@
 title: AWS s3access logs
 release: beta
-type: logs
+type: logfile
 streams:
 - input: s3
   template_path: s3.yml.hbs

diff --git a/packages/aws/dataset/vpcflow/manifest.yml b/packages/aws/dataset/vpcflow/manifest.yml
@@ -1,6 +1,6 @@
 title: AWS vpcflow logs
 release: beta
-type: logs
+type: logfile
 streams:
 - input: s3
   template_path: s3.yml.hbs

diff --git a/packages/cisco/dataset/asa/manifest.yml b/packages/cisco/dataset/asa/manifest.yml
@@ -1,6 +1,6 @@
 title: Cisco ASA logs
 release: beta
-type: logs
+type: logfile
 streams:
 - input: udp
   title: Cisco ASA logs

diff --git a/packages/cisco/dataset/ftd/manifest.yml b/packages/cisco/dataset/ftd/manifest.yml
@@ -1,6 +1,6 @@
 title: Cisco FTD logs
 release: beta
-type: logs
+type: logfile
 streams:
 - input: udp
   title: Cisco FTD logs

diff --git a/packages/cisco/dataset/ios/agent/stream/stream.yml.hbs b/packages/cisco/dataset/ios/agent/stream/stream.yml.hbs
@@ -220,6 +220,7 @@ processors:
                 process: function(evt) {
                     copyOriginalMessage.Run(evt);
 
+                    // TODO: Need to investigate if we need to update things on the Beats side too
                     if (evt.Get("input.type") === "log") {
                         parseSyslogFileHeader.Run(evt);
                     }

diff --git a/packages/cisco/dataset/ios/agent/stream/syslog.yml.hbs b/packages/cisco/dataset/ios/agent/stream/syslog.yml.hbs
@@ -217,6 +217,7 @@ processors:
                 process: function(evt) {
                     copyOriginalMessage.Run(evt);
 
+                    // TOOD: Check in Beats to rename it
                     if (evt.Get("input.type") === "log") {
                         parseSyslogFileHeader.Run(evt);
                     }

diff --git a/packages/cisco/dataset/ios/manifest.yml b/packages/cisco/dataset/ios/manifest.yml
@@ -1,6 +1,6 @@
 title: Cisco IOS logs
 release: beta
-type: logs
+type: logfile
 streams:
 - input: syslog
   title: Cisco IOS logs

diff --git a/packages/cisco/manifest.yml b/packages/cisco/manifest.yml
@@ -35,6 +35,6 @@ datasources:
       - type: syslog
         title: Collect logs from Cisco via syslog
         description: Collecting logs from Cisco IOS via syslog
-      - type: logs
+      - type: logfile
         title: Collect logs from Cisco via file
         description: Collecting logs from Cisco ASA, FTD, and IOS via file
diff --git a/packages/kafka/dataset/log/manifest.yml b/packages/kafka/dataset/log/manifest.yml
@@ -1,6 +1,6 @@
 title: Kafka log logs
 release: beta
-type: logs
+type: logfile
 streams:
 - input: logs
   vars:

diff --git a/packages/kafka/manifest.yml b/packages/kafka/manifest.yml
@@ -34,7 +34,7 @@ datasources:
   title: Kafka logs and metrics
   description: Collect logs and metrics from Kafka brokers
   inputs:
-  - type: logs
+  - type: logfile
     title: Collect logs from Kafka brokers
     description: Collecting Kafka log logs
   - type: kafka/metrics

diff --git a/packages/log/dataset/log/manifest.yml b/packages/log/dataset/log/manifest.yml
@@ -1,6 +1,6 @@
 title: Log Dataset
 
-type: logs
+type: logfile
 
 default: true
 id: generic

diff --git a/packages/log/manifest.yml b/packages/log/manifest.yml
@@ -15,7 +15,7 @@ datasources:
     title: Custom logs
     description: Collect your custom log files.
     inputs:
-      - type: logs
+      - type: logfile
         title: Custom log file
         description: Collect your custom log files.
 

diff --git a/packages/mysql/dataset/error/manifest.yml b/packages/mysql/dataset/error/manifest.yml
@@ -1,5 +1,5 @@
 title: MySQL error logs
-type: logs
+type: logfile
 release: beta
 streams:
 - input: logs

diff --git a/packages/mysql/dataset/slowlog/manifest.yml b/packages/mysql/dataset/slowlog/manifest.yml
@@ -1,5 +1,5 @@
 title: MySQL slowlog logs
-type: logs
+type: logfile
 release: beta
 streams:
 - input: logs

diff --git a/packages/mysql/manifest.yml b/packages/mysql/manifest.yml
@@ -34,7 +34,7 @@ datasources:
   title: MySQL logs and metrics
   description: Collect logs and metrics from MySQL instances
   inputs:
-  - type: logs
+  - type: logfile
     title: Collect logs from MySQL hosts
     description: Collecting MySQL error and slowlog logs
   - type: mysql/metrics

diff --git a/packages/netflow/dataset/log/manifest.yml b/packages/netflow/dataset/log/manifest.yml
@@ -1,6 +1,6 @@
 title: NetFlow logs
 release: beta
-type: logs
+type: logfile
 streams:
 - input: netflow
   template_path: netflow.yml.hbs

diff --git a/packages/nginx/dataset/access/manifest.yml b/packages/nginx/dataset/access/manifest.yml
@@ -1,5 +1,5 @@
 title: Nginx access logs
-type: logs
+type: logfile
 release: beta
 streams:
 - input: logs

diff --git a/packages/nginx/dataset/error/manifest.yml b/packages/nginx/dataset/error/manifest.yml
@@ -1,5 +1,5 @@
 title: Nginx error logs
-type: logs
+type: logfile
 release: beta
 streams:
 - input: logs

diff --git a/packages/nginx/dataset/ingress_controller/manifest.yml b/packages/nginx/dataset/ingress_controller/manifest.yml
@@ -1,5 +1,5 @@
 title: Nginx ingress_controller logs
-type: logs
+type: logfile
 release: beta
 streams:
 - input: logs

diff --git a/packages/nginx/manifest.yml b/packages/nginx/manifest.yml
@@ -34,7 +34,7 @@ datasources:
   title: Nginx logs and metrics
   description: Collect logs and metrics from Nginx instances
   inputs:
-  - type: logs
+  - type: logfile
     title: Collect logs from Nginx instances
     description: Collecting Nginx access, error and ingress controller logs
   - type: nginx/metrics

diff --git a/packages/redis/dataset/log/manifest.yml b/packages/redis/dataset/log/manifest.yml
@@ -1,5 +1,5 @@
 title: Redis application logs
-type: logs
+type: logfile
 release: beta
 streams:
 - input: logs

diff --git a/packages/redis/dataset/slowlog/manifest.yml b/packages/redis/dataset/slowlog/manifest.yml
@@ -1,5 +1,5 @@
 title: Redis slow logs
-type: logs
+type: logfile
 release: beta
 streams:
 - input: redis

diff --git a/packages/redis/manifest.yml b/packages/redis/manifest.yml
@@ -34,7 +34,7 @@ datasources:
   title: Redis logs and metrics
   description: Collect logs and metrics from Redis instances
   inputs:
-  - type: logs
+  - type: logfile
     title: Collect Redis application logs
     description: Collecting application logs from Redis instances
   - type: redis

diff --git a/packages/system/dataset/auth/manifest.yml b/packages/system/dataset/auth/manifest.yml
@@ -1,6 +1,6 @@
 title: System auth logs
 release: experimental
-type: logs
+type: logfile
 streams:
 - input: logs
   vars:

diff --git a/packages/system/dataset/syslog/manifest.yml b/packages/system/dataset/syslog/manifest.yml
@@ -1,6 +1,6 @@
 title: System syslog logs
 release: experimental
-type: logs
+type: logfile
 streams:
 - input: logs
   vars:

diff --git a/packages/system/manifest.yml b/packages/system/manifest.yml
@@ -33,7 +33,7 @@ datasources:
   title: System logs and metrics
   description: Collect logs and metrics from System instances
   inputs:
-  - type: logs
+  - type: logfile
     title: Collect logs from System instances
     description: Collecting System auth and syslog logs
   - type: system/metrics