Merge pull request #165 from Axway-API-Management-Plus/apigateway-only

Adding support for an Apigateway only environment

Author: Chris Wiechmann

.github/workflows/apibuilder4elastic.yml

@@ -134,6 +134,7 @@ jobs:
       env:
         ELASTICSEARCH_HOSTS: 'http://localhost:9200'
         VALIDATE_CONFIG: false
+        ELASTICSEARCH_SSL_VERIFICATIONMODE: false
         LOG_LEVEL: DEBUG
         DISABLE_SETUP_FLOWS: true # Disable Elasticsearch setup flows for the tests.
         CI: true

.github/workflows/logstash.yml

@@ -20,6 +20,7 @@ jobs:
           VALIDATE_ELASTIC_CONNECTION: false
           ENABLE_HTTP_PORT: true
           ELASTICSEARCH_HOSTS: http://any.es-host.com:9200
+          ELASTICSEARCH_SSL_VERIFICATIONMODE: false
       memcached:
         image: memcached:1.6.6-alpine
         ports: 

CHANGELOG.md

@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Added a warning when running Logstash or Elasticsearch with default minimal parameters (when using docker-compose) [#163](https://github.com/Axway-API-Management-Plus/apigateway-openlogging-elk/issues/163)
 - Added a new visualization: Status by API to all API-Overview dashboards showing Success, Failure/Blocked and Failed status per API
 - Added tag kpis to the KPI-Dashboard
+- Added new parameter: `API_MANAGER_ENABLED` to allow running the solution without an API-Manager at all
+- Updated default Elastic-Stack version from 7.16.3 to 7.17.0
 
 ### Security
 - Mocha in API-Builder4Elastic updated to version 9.2.0 to solve https://nvd.nist.gov/vuln/detail/CVE-2021-23566

UPDATE.md

@@ -37,7 +37,7 @@ On the other hand, the API builder Docker image, as a central component of the s
 
 | Ver   | API-Builder                        | Logstash                           | Memcached                          | Filebeat      | ANM-Config      | Dashboards      | Params          |Elastic-Config      | ELK-Ver.| Notes      |
 | :---  | :---:                              | :---:                              | :---:                              | :---:         | :---:           | :---:           | :---:           |:---:               | :---:   | :---       |
-| 4.2.0 | -                                  | -                                  | -                                  | -             | -               | [X](#dashboards)| -               |-                   | [7.16.3](#update-elastic-stack-version)  | Unreleased |
+| 4.2.0 | -                                  | -                                  | -                                  | -             | -               | [X](#dashboards)| [X](#parameters)|-                   | [7.16.3](#update-elastic-stack-version)  | Unreleased |
 | 4.1.0 | [X](#api-builderlogstashmemcached) | -                                  | -                                  | -             | -               | -               | [X](#parameters)|[X](#elastic-config)| [7.16.3](#update-elastic-stack-version)  |          |
 | 4.0.3 | -                                  | -                                  | -                                  | -             | -               | -               | -               |-                   | [7.16.2](#update-elastic-stack-version)  |            |
 | 4.0.2 | -                                  | -                                  | -                                  | -             | -               | -               | -               |-                   | [7.16.1](#update-elastic-stack-version)  | See #154   |

apibuilder4elastic/conf/axway-api-utils.default.js

@@ -9,7 +9,8 @@ module.exports = {
 			'apimanager': {
 				url: process.env.API_MANAGER, // If not set, the Admin-Node-Manager hostname is used
 				username: process.env.API_MANAGER_USERNAME, // User with Admin-Privileges required
-				password: process.env.API_MANAGER_PASSWORD
+				password: process.env.API_MANAGER_PASSWORD,
+				enabled: ("false" == process.env.API_MANAGER_ENABLED) ? false : true // Makes it possible to use the solution without an API-Manager at all
 			}, 
 			// Which file to use for the local API-Lookup
 			localLookupFile: process.env.API_BUILDER_LOCAL_API_LOOKUP_FILE,

apibuilder4elastic/conf/default.js

@@ -31,7 +31,8 @@ module.exports = {
 
 	// The interval in milliseconds in which API-Builder will poll all configured API-Managers for their KPIs. Defaults to 3600000 (which is 1 hour)
 	managementKPIsInterval: process.env.MANAGEMENT_KPIS_INTERVAL || '3600000',
-	managementKPIsEnabled: ("false" == process.env.MANAGEMENT_KPIS_ENABLED) ? false : true, 
+	// Management KPI will be disabled also, if the API-Manager is disabled
+	managementKPIsEnabled: ("false" == process.env.MANAGEMENT_KPIS_ENABLED || "false" == process.env.API_MANAGER_ENABLED) ? false : true, 
 
 	// This path is optional and if given used to adjust the ILM-Configuration.
 	retentionPeriodConfigFile: process.env.RETENTION_PERIOD_CONFIG || 'NotSet',

apibuilder4elastic/conf/elasticsearch.default.js

@@ -15,11 +15,11 @@ module.exports = {
 				// The name to identify the client instance in the events.
 				name: process.env.ELASTICSEARCH_CLIENT_NAME || 'apibuilder4elastic',
 				// You can use all configuration options documented here: 
-				// https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/7.x/client-configuration.html
+				// https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/master/client-configuration.html
 				maxRetries: 5,
 				requestTimeout: 60000,
 				ssl: {
-					ca: ("false" == process.env.ELASTICSEARCH_SSL_VERIFICATIONMODE) ? fs.readFileSync(process.env.ELASTICSEARCH_CA) : "",
+					ca: ("false" == process.env.ELASTICSEARCH_SSL_VERIFICATIONMODE) ? "" : fs.readFileSync(process.env.ELASTICSEARCH_CA),
 					rejectUnauthorized: ("false" == process.env.ELASTICSEARCH_SSL_VERIFICATIONMODE) ? false : true
 				}
 			},

apibuilder4elastic/custom_flow_nodes/api-builder-plugin-axway-api-management/config/axway-api-utils.default.js

@@ -9,7 +9,8 @@ module.exports = {
 			'apimanager': {
 				url: process.env.API_MANAGER, // If not set, the API-Gateway hostname is used
 				username: process.env.API_MANAGER_USERNAME, // User with Admin-Privileges required
-				password: process.env.API_MANAGER_PASSWORD 
+				password: process.env.API_MANAGER_PASSWORD, 
+				enabled: (!process.env.API_MANAGER_ENABLED) ? process.env.API_MANAGER_ENABLED : true // Makes it possible to use the solution without an API-Manager at all
 			}, 
 			// This is true, when running as part of the CI-Pipeline (GitHub Actions)
 			// If true, some test API-Requests are then mocked

apibuilder4elastic/custom_flow_nodes/api-builder-plugin-axway-api-management/package-lock.json

@@ -27,7 +27,7 @@
 		"@axway/api-builder-test-utils": "^1.3.0",
 		"chai": "^4.3.4",
 		"decache": "^4.6.0",
-		"dotenv": "^10.0.0",
+		"dotenv": "^14.2.0",
 		"mocha": "^9.1.2",
 		"nock": "^13.1.1",
 		"simple-mock": "^0.8.0"