Set required kibana version to ^7.9.0 (elastic#152)

* Set required kibana version to ^7.9.0 * Update tips
build-security · Jul 2, 2020 · 119ea95 · 119ea95
1 parent edef0d2
commit 119ea95
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 87 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -367,6 +367,13 @@ on the business or technical requirements for the entire platform (Elastic Packa
 
    The list of available categories is present in the Package Registry source: https://github.com/elastic/package-registry/blob/e93e801a6dfbfa6f83c8b69f6e9405603151f937/util/package.go#L27-L51
 
+4. Make sure that the version condition for kibana is set to `^7.9.0`.
+
+   ```yaml
+   conditions:
+     kibana.version: '^7.9.0'
+   ```
+
 ### All integrations
 
 #### Code reviewers

diff --git a/dev/import-beats/conditions.go b/dev/import-beats/conditions.go
@@ -5,82 +5,15 @@
 package main
 
 import (
-	"encoding/json"
-	"fmt"
-
 	"github.com/blang/semver"
-	"github.com/pkg/errors"
 
 	"github.com/elastic/package-registry/util"
 )
 
 var zeroVersion = semver.MustParse("0.0.0")
 
-func createConditions(kibanaContent kibanaContent, datasetContent []datasetContent) (*util.Conditions, error) {
-	kibanaRequirement, err := findRequiredKibanaVersion(kibanaContent)
-	if err != nil {
-		return nil, errors.Wrapf(err, "finding required Kibana version failed")
-	}
+func createConditions() *util.Conditions {
 	return &util.Conditions{
-		KibanaVersion: kibanaRequirement,
-	}, nil
-}
-
-func findRequiredKibanaVersion(kibanaContent kibanaContent) (string, error) {
-	dashboards, ok := kibanaContent.files["dashboard"]
-	if !ok {
-		return "", nil // no dashboards available, no version requirement
-	}
-
-	currentVersion := zeroVersion
-
-	for _, dashboardFile := range dashboards {
-		var dashboard mapStr
-		err := json.Unmarshal(dashboardFile, &dashboard)
-		if err != nil {
-			return "", errors.Wrap(err, "unmarshalling dashboard filed")
-		}
-
-		panels, err := dashboard.getValue("attributes.panelsJSON")
-		if err == errKeyNotFound {
-			continue // panelsJSON is missing, skip this dashboard
-		}
-		if err != nil {
-			return "", errors.Wrap(err, "retrieving key 'attributes.panelsJSON' failed")
-		}
-
-		panelsValue := panels.([]interface{})
-		if len(panelsValue) == 0 {
-			continue // panelsJSON is present, but empty, skip this dashboard
-		}
-
-		for _, panel := range panelsValue {
-			panelValue, err := toMapStr(panel)
-			if err != nil {
-				return "", errors.Wrap(err, "converting to mapstr failed")
-			}
-
-			version, err := panelValue.getValue("version")
-			if err == errKeyNotFound {
-				continue // no version tag, skip this panel
-			}
-			if err != nil {
-				return "", errors.Wrap(err, "retrieving key 'version' failed")
-			}
-			versionValue := version.(string)
-			parsed, err := semver.Parse(versionValue)
-			if err != nil {
-				return "", errors.Wrapf(err, "parsing version failed (value: %s)", versionValue)
-			}
-
-			if currentVersion.LT(parsed) {
-				currentVersion = parsed
-			}
-		}
-	}
-
-	if currentVersion.EQ(zeroVersion) {
-		return "", nil // no version requirement found, even if all files were visited.
+		KibanaVersion: "^7.9.0",
 	}
-	return fmt.Sprintf("~%s", currentVersion), nil
 }
diff --git a/dev/import-beats/packages.go b/dev/import-beats/packages.go
@@ -230,10 +230,7 @@ func (r *packageRepository) createPackagesFromSource(beatsDir, beatName, beatTyp
 			return err
 		}
 		aPackage.addKibanaContent(kibana)
-		manifest.Conditions, err = createConditions(aPackage.kibana, aPackage.datasets)
-		if err != nil {
-			return err
-		}
+		manifest.Conditions = createConditions()
 
 		aPackage.manifest = manifest
 		r.packages[moduleDir.Name()] = aPackage

diff --git a/packages/apache/manifest.yml b/packages/apache/manifest.yml
@@ -10,7 +10,7 @@ categories:
 release: beta
 removable: true
 conditions:
-  kibana.version: '~7.3.1'
+  kibana.version: '^7.9.0'
 screenshots:
 - src: /img/kibana-apache.png
   title: Apache Integration

diff --git a/packages/aws/manifest.yml b/packages/aws/manifest.yml
@@ -12,7 +12,7 @@ categories:
 - security
 release: beta
 conditions:
-  kibana.version: '~7.3.0'
+  kibana.version: '^7.9.0'
 screenshots:
 - src: /img/filebeat-aws-cloudtrail.png
   title: filebeat aws cloudtrail

diff --git a/packages/cisco/manifest.yml b/packages/cisco/manifest.yml
@@ -10,7 +10,7 @@ categories:
 - security
 release: beta
 conditions:
-  kibana.version: '~7.3.0'
+  kibana.version: '^7.9.0'
 screenshots:
   - src: /img/kibana-cisco-asa.png
     title: kibana cisco asa

diff --git a/packages/kafka/manifest.yml b/packages/kafka/manifest.yml
@@ -9,7 +9,7 @@ categories:
 - message_queue
 release: beta
 conditions:
-  kibana.version: '~7.3.0'
+  kibana.version: '^7.9.0'
 screenshots:
 - src: /img/filebeat-kafka-logs-overview.png
   title: filebeat kafka logs overview

diff --git a/packages/kubernetes/manifest.yml b/packages/kubernetes/manifest.yml
@@ -10,7 +10,7 @@ categories:
 - kubernetes
 release: beta
 conditions:
-  kibana.version: '~7.3.0'
+  kibana.version: '^7.9.0'
 screenshots:
 - src: /img/metricbeat_kubernetes_overview.png
   title: Metricbeat Kubernetes Overview

diff --git a/packages/mongodb/manifest.yml b/packages/mongodb/manifest.yml
@@ -15,7 +15,7 @@ license: basic
 release: beta
 removable: true
 conditions:
-  kibana.version: '~7.3.0'
+  kibana.version: '^7.9.0'
 screenshots:
 - src: /img/filebeat-mongodb-overview.png
   title: filebeat mongodb overview

diff --git a/packages/mysql/manifest.yml b/packages/mysql/manifest.yml
@@ -9,7 +9,7 @@ categories:
 - datastore
 release: beta
 conditions:
-  kibana.version: '~7.3.0'
+  kibana.version: '^7.9.0'
 screenshots:
 - src: /img/kibana-mysql.png
   title: kibana mysql

diff --git a/packages/netflow/manifest.yml b/packages/netflow/manifest.yml
@@ -10,7 +10,7 @@ categories:
 - security
 release: beta
 conditions:
-  kibana.version: '~7.3.0'
+  kibana.version: '^7.9.0'
 config_templates:
 - name: netflow
   title: NetFlow logs

diff --git a/packages/nginx/manifest.yml b/packages/nginx/manifest.yml
@@ -10,7 +10,7 @@ categories:
 - security
 release: beta
 conditions:
-  kibana.version: '~7.3.0'
+  kibana.version: '^7.9.0'
 screenshots:
 - src: /img/kibana-nginx.png
   title: kibana nginx

diff --git a/packages/postgresql/manifest.yml b/packages/postgresql/manifest.yml
@@ -9,7 +9,7 @@ categories:
 - datastore
 release: beta
 conditions:
-  kibana.version: '~7.3.0'
+  kibana.version: '^7.9.0'
 screenshots:
 - src: /img/filebeat-postgresql-overview.png
   title: Filebeat PostgreSQL overview

diff --git a/packages/rabbitmq/manifest.yml b/packages/rabbitmq/manifest.yml
@@ -10,7 +10,7 @@ categories:
 release: beta
 removable: true
 conditions:
-  kibana.version: '~7.3.0'
+  kibana.version: '^7.9.0'
 icons:
 - src: /img/logo_rabbitmq.svg
   title: RabbitMQ Logo

diff --git a/packages/redis/manifest.yml b/packages/redis/manifest.yml
@@ -10,7 +10,7 @@ categories:
 - message_queue
 release: beta
 conditions:
-  kibana.version: '~7.3.0'
+  kibana.version: '^7.9.0'
 screenshots:
 - src: /img/kibana-redis.png
   title: kibana redis

diff --git a/packages/system/manifest.yml b/packages/system/manifest.yml
@@ -10,7 +10,7 @@ categories:
 - security
 release: beta
 conditions:
-  kibana.version: '~7.3.0'
+  kibana.version: '^7.9.0'
 screenshots:
 - src: /img/kibana-system.png
   title: kibana system

diff --git a/packages/windows/manifest.yml b/packages/windows/manifest.yml
@@ -16,7 +16,7 @@ license: basic
 release: beta
 removable: true
 conditions:
-  kibana.version: '~7.3.0'
+  kibana.version: '^7.9.0'
 screenshots:
 - src: /img/metricbeat-windows-service.png
   title: metricbeat windows service