Skip to content

Commit

Permalink
Merge pull request #11902 from lafirest/feat/sys_v2
Browse files Browse the repository at this point in the history
feat(sysk): integrated Nari Syskeeper 2000 as a new bridge backend
  • Loading branch information
lafirest committed Nov 10, 2023
2 parents 6500d21 + 447c933 commit 1c04499
Show file tree
Hide file tree
Showing 29 changed files with 2,494 additions and 10 deletions.
3 changes: 2 additions & 1 deletion apps/emqx_bridge/src/emqx_bridge.erl
Expand Up @@ -93,7 +93,8 @@
T == iotdb;
T == kinesis_producer;
T == greptimedb;
T == azure_event_hub_producer
T == azure_event_hub_producer;
T == syskeeper_forwarder
).

-define(ROOT_KEY, bridges).
Expand Down
10 changes: 8 additions & 2 deletions apps/emqx_bridge/src/emqx_bridge_v2.erl
Expand Up @@ -804,7 +804,9 @@ bridge_v2_type_to_connector_type(kafka) ->
bridge_v2_type_to_connector_type(kafka_producer) ->
kafka_producer;
bridge_v2_type_to_connector_type(azure_event_hub_producer) ->
azure_event_hub_producer.
azure_event_hub_producer;
bridge_v2_type_to_connector_type(syskeeper_forwarder) ->
syskeeper_forwarder.

%%====================================================================
%% Data backup API
Expand Down Expand Up @@ -1031,7 +1033,9 @@ bridge_v1_type_to_bridge_v2_type(kafka) ->
bridge_v1_type_to_bridge_v2_type(kafka_producer) ->
kafka_producer;
bridge_v1_type_to_bridge_v2_type(azure_event_hub_producer) ->
azure_event_hub_producer.
azure_event_hub_producer;
bridge_v1_type_to_bridge_v2_type(syskeeper_forwarder) ->
syskeeper_forwarder.

%% This function should return true for all inputs that are bridge V1 types for
%% bridges that have been refactored to bridge V2s, and for all all bridge V2
Expand All @@ -1044,6 +1048,8 @@ is_bridge_v2_type(<<"kafka">>) ->
true;
is_bridge_v2_type(<<"azure_event_hub_producer">>) ->
true;
is_bridge_v2_type(<<"syskeeper_forwarder">>) ->
true;
is_bridge_v2_type(_) ->
false.

Expand Down
16 changes: 14 additions & 2 deletions apps/emqx_bridge/src/schema/emqx_bridge_v2_enterprise.erl
Expand Up @@ -28,7 +28,8 @@ examples(Method) ->
schema_modules() ->
[
emqx_bridge_kafka,
emqx_bridge_azure_event_hub
emqx_bridge_azure_event_hub,
emqx_bridge_syskeeper
].

fields(actions) ->
Expand All @@ -51,13 +52,24 @@ action_structs() ->
desc => <<"Azure Event Hub Actions Config">>,
required => false
}
)},
{syskeeper_forwarder,
mk(
hoconsc:map(name, ref(emqx_bridge_syskeeper, config)),
#{
desc => <<"Syskeeper forwarder Bridge V2 Config">>,
required => false
}
)}
].

api_schemas(Method) ->
[
api_ref(emqx_bridge_kafka, <<"kafka_producer">>, Method ++ "_bridge_v2"),
api_ref(emqx_bridge_azure_event_hub, <<"azure_event_hub_producer">>, Method ++ "_bridge_v2")
api_ref(
emqx_bridge_azure_event_hub, <<"azure_event_hub_producer">>, Method ++ "_bridge_v2"
),
api_ref(emqx_bridge_syskeeper, <<"syskeeper_forwarder">>, Method)
].

api_ref(Module, Type, Method) ->
Expand Down
94 changes: 94 additions & 0 deletions apps/emqx_bridge_syskeeper/BSL.txt
@@ -0,0 +1,94 @@
Business Source License 1.1

Licensor: Hangzhou EMQ Technologies Co., Ltd.
Licensed Work: EMQX Enterprise Edition
The Licensed Work is (c) 2023
Hangzhou EMQ Technologies Co., Ltd.
Additional Use Grant: Students and educators are granted right to copy,
modify, and create derivative work for research
or education.
Change Date: 2027-02-01
Change License: Apache License, Version 2.0

For information about alternative licensing arrangements for the Software,
please contact Licensor: https://www.emqx.com/en/contact

Notice

The Business Source License (this document, or the “License”) is not an Open
Source license. However, the Licensed Work will eventually be made available
under an Open Source License, as stated in this License.

License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
“Business Source License” is a trademark of MariaDB Corporation Ab.

-----------------------------------------------------------------------------

Business Source License 1.1

Terms

The Licensor hereby grants you the right to copy, modify, create derivative
works, redistribute, and make non-production use of the Licensed Work. The
Licensor may make an Additional Use Grant, above, permitting limited
production use.

Effective on the Change Date, or the fourth anniversary of the first publicly
available distribution of a specific version of the Licensed Work under this
License, whichever comes first, the Licensor hereby grants you rights under
the terms of the Change License, and the rights granted in the paragraph
above terminate.

If your use of the Licensed Work does not comply with the requirements
currently in effect as described in this License, you must purchase a
commercial license from the Licensor, its affiliated entities, or authorized
resellers, or you must refrain from using the Licensed Work.

All copies of the original and modified Licensed Work, and derivative works
of the Licensed Work, are subject to this License. This License applies
separately for each version of the Licensed Work and the Change Date may vary
for each version of the Licensed Work released by Licensor.

You must conspicuously display this License on each original or modified copy
of the Licensed Work. If you receive the Licensed Work in original or
modified form from a third party, the terms and conditions set forth in this
License apply to your use of that work.

Any use of the Licensed Work in violation of this License will automatically
terminate your rights under this License for the current and all other
versions of the Licensed Work.

This License does not grant you any right in any trademark or logo of
Licensor or its affiliates (provided that you may use a trademark or logo of
Licensor as expressly required by this License).

TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
TITLE.

MariaDB hereby grants you permission to use this License’s text to license
your works, and to refer to it using the trademark “Business Source License”,
as long as you comply with the Covenants of Licensor below.

Covenants of Licensor

In consideration of the right to use this License’s text and the “Business
Source License” name and trademark, Licensor covenants to MariaDB, and to all
other recipients of the licensed work to be provided by Licensor:

1. To specify as the Change License the GPL Version 2.0 or any later version,
or a license that is compatible with GPL Version 2.0 or a later version,
where “compatible” means that software provided under the Change License can
be included in a program with software provided under GPL Version 2.0 or a
later version. Licensor may specify additional Change Licenses without
limitation.

2. To either: (a) specify an additional grant of rights to use that does not
impose any additional restriction on the right granted in this License, as
the Additional Use Grant; or (b) insert the text “None”.

3. To specify a Change Date.

4. Not to modify this License in any other way.
30 changes: 30 additions & 0 deletions apps/emqx_bridge_syskeeper/README.md
@@ -0,0 +1,30 @@
# EMQX Syskeeper Bridge

Nari Syskeeper 2000 is a one-way Physical Isolation Net Gap.

The application is used to connect EMQX and Syskeeper.
Users can create a rule and quickly ingest IoT data to the Syskeeper by leveraging
[EMQX Rules](https://docs.emqx.com/en/enterprise/v5.0/data-integration/rules.html).

# Documentation

- Refer to [Rules engine](https://docs.emqx.com/en/enterprise/v5.0/data-integration/rules.html)
for the EMQX rules engine introduction.

# HTTP APIs

- Several APIs are provided for bridge management, which includes create bridge,
update bridge, get bridge, stop or restart bridge and list bridges etc.

Refer to [API Docs - Bridges](https://docs.emqx.com/en/enterprise/v5.0/admin/api-docs.html#tag/Bridges)
for more detailed information.


# Contributing

Please see our [contributing.md](../../CONTRIBUTING.md).


# License

EMQ Business Source License 1.1, refer to [LICENSE](BSL.txt).

0 comments on commit 1c04499

Please sign in to comment.