Remove removable from import script

The field removable is not supported anymore in the registry, see elastic/package-registry#532. This removes it from the importer script. Also removed it from the existing packages so the next releases will not contain anymore. It is not an issue that some of the existing packages contain it.
ruflin · Jun 29, 2020 · 28d414b · 28d414b
1 parent 2dea774
commit 28d414b
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 18 deletions.
diff --git a/dev/import-beats/packages.go b/dev/import-beats/packages.go
@@ -23,8 +23,6 @@ import (
 
 var ignoredModules = map[string]bool{"apache2": true}
 
-var removablePackages = map[string]bool{"system": false}
-
 type packageContent struct {
 	manifest   util.Package
 	datasets   datasetContentArray
@@ -43,21 +41,15 @@ func newPackageContent(name string) packageContent {
 				Version: "0.0.1", // TODO
 				Type:    "integration",
 			},
-			License:   "basic",
-			Removable: determineIfPackageIsRemovable(name),
-			Release:   "experimental",
+			License: "basic",
+			Release: "experimental",
 		},
 		kibana: kibanaContent{
 			files: map[string]map[string][]byte{},
 		},
 	}
 }
 
-func determineIfPackageIsRemovable(name string) bool {
-	_, ok := removablePackages[name]
-	return !ok
-}
-
 func (pc *packageContent) addDatasets(ds []datasetContent) {
 	for _, dc := range ds {
 		for i, v := range pc.datasets {

diff --git a/packages/aws/manifest.yml b/packages/aws/manifest.yml
@@ -9,7 +9,6 @@ categories:
 - logs
 - metrics
 release: beta
-removable: true
 requirement:
   kibana:
     versions: '>=8.0.0-SNAPSHOT <8.0.0'

diff --git a/packages/cisco/manifest.yml b/packages/cisco/manifest.yml
@@ -8,7 +8,6 @@ type: integration
 categories:
   - logs
 release: beta
-removable: true
 requirement:
   kibana:
     versions: ">=7.0.0-SNAPSHOT <8.0.0"

diff --git a/packages/kafka/manifest.yml b/packages/kafka/manifest.yml
@@ -9,7 +9,6 @@ categories:
 - logs
 - metrics
 release: beta
-removable: true
 requirement:
   kibana:
     versions: '>=7.3.0 <8.0.0'

diff --git a/packages/mysql/manifest.yml b/packages/mysql/manifest.yml
@@ -9,7 +9,6 @@ categories:
 - logs
 - metrics
 release: beta
-removable: true
 requirement:
   kibana:
     versions: '>=7.3.1 <8.0.0'

diff --git a/packages/netflow/manifest.yml b/packages/netflow/manifest.yml
@@ -8,7 +8,6 @@ type: integration
 categories:
 - logs
 release: beta
-removable: true
 requirement:
   kibana:
     versions: '>=7.3.0 <8.0.0'

diff --git a/packages/nginx/manifest.yml b/packages/nginx/manifest.yml
@@ -9,7 +9,6 @@ categories:
 - logs
 - metrics
 release: beta
-removable: true
 requirement:
   kibana:
     versions: '>=7.3.0 <8.0.0'

diff --git a/packages/redis/manifest.yml b/packages/redis/manifest.yml
@@ -9,7 +9,6 @@ categories:
 - logs
 - metrics
 release: beta
-removable: true
 requirement:
   kibana:
     versions: '>=7.3.0 <8.0.0'

diff --git a/packages/system/manifest.yml b/packages/system/manifest.yml
@@ -9,7 +9,6 @@ categories:
 - logs
 - metrics
 release: beta
-removable: false
 screenshots:
 - src: /img/kibana-system.png
   title: kibana system