diff options
Diffstat (limited to '')
| -rw-r--r-- | aclk/README.md | 133 | ||||
| -rw-r--r-- | aclk/aclk-schemas/.gitignore | 11 | ||||
| -rw-r--r-- | aclk/aclk-schemas/.travis.yml | 4 | ||||
| -rw-r--r-- | aclk/aclk-schemas/LICENSE | 674 | ||||
| -rw-r--r-- | aclk/aclk-schemas/Makefile | 74 | ||||
| -rw-r--r-- | aclk/aclk-schemas/README.md | 2 | ||||
| -rw-r--r-- | aclk/aclk-schemas/buf.yml | 9 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/aclk/v1/lib.proto | 22 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/agent/v1/cmds.proto | 79 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/agent/v1/connection.proto | 59 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/agent/v1/disconnect.proto | 16 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/alarm/v1/config.proto | 61 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/alarm/v1/stream.proto | 148 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/chart/v1/config.proto | 37 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/chart/v1/dimension.proto | 24 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/chart/v1/instance.proto | 32 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/chart/v1/stream.proto | 86 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/context/v1/context.proto | 57 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/context/v1/stream.proto | 34 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.proto | 37 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.proto | 32 | ||||
| -rw-r--r-- | aclk/aclk-schemas/proto/nodeinstance/info/v1/info.proto | 148 | ||||
| -rw-r--r-- | aclk/schema-wrappers/schema_wrapper_utils.h | 24 | ||||
| -rw-r--r-- | src/aclk/aclk.c (renamed from aclk/aclk.c) | 20 | ||||
| -rw-r--r-- | src/aclk/aclk.h (renamed from aclk/aclk.h) | 0 | ||||
| -rw-r--r-- | src/aclk/aclk_alarm_api.c (renamed from aclk/aclk_alarm_api.c) | 0 | ||||
| -rw-r--r-- | src/aclk/aclk_alarm_api.h (renamed from aclk/aclk_alarm_api.h) | 0 | ||||
| -rw-r--r-- | src/aclk/aclk_capas.c (renamed from aclk/aclk_capas.c) | 3 | ||||
| -rw-r--r-- | src/aclk/aclk_capas.h (renamed from aclk/aclk_capas.h) | 0 | ||||
| -rw-r--r-- | src/aclk/aclk_contexts_api.c (renamed from aclk/aclk_contexts_api.c) | 0 | ||||
| -rw-r--r-- | src/aclk/aclk_contexts_api.h (renamed from aclk/aclk_contexts_api.h) | 0 | ||||
| -rw-r--r-- | src/aclk/aclk_otp.c (renamed from aclk/aclk_otp.c) | 4 | ||||
| -rw-r--r-- | src/aclk/aclk_otp.h (renamed from aclk/aclk_otp.h) | 0 | ||||
| -rw-r--r-- | src/aclk/aclk_proxy.c (renamed from aclk/aclk_proxy.c) | 21 | ||||
| -rw-r--r-- | src/aclk/aclk_proxy.h (renamed from aclk/aclk_proxy.h) | 1 | ||||
| -rw-r--r-- | src/aclk/aclk_query.c (renamed from aclk/aclk_query.c) | 73 | ||||
| -rw-r--r-- | src/aclk/aclk_query.h (renamed from aclk/aclk_query.h) | 4 | ||||
| -rw-r--r-- | src/aclk/aclk_query_queue.c (renamed from aclk/aclk_query_queue.c) | 18 | ||||
| -rw-r--r-- | src/aclk/aclk_query_queue.h (renamed from aclk/aclk_query_queue.h) | 9 | ||||
| -rw-r--r-- | src/aclk/aclk_rrdhost_state.h (renamed from aclk/aclk_rrdhost_state.h) | 0 | ||||
| -rw-r--r-- | src/aclk/aclk_rx_msgs.c (renamed from aclk/aclk_rx_msgs.c) | 17 | ||||
| -rw-r--r-- | src/aclk/aclk_rx_msgs.h (renamed from aclk/aclk_rx_msgs.h) | 0 | ||||
| -rw-r--r-- | src/aclk/aclk_stats.c (renamed from aclk/aclk_stats.c) | 5 | ||||
| -rw-r--r-- | src/aclk/aclk_stats.h (renamed from aclk/aclk_stats.h) | 4 | ||||
| -rw-r--r-- | src/aclk/aclk_tx_msgs.c (renamed from aclk/aclk_tx_msgs.c) | 2 | ||||
| -rw-r--r-- | src/aclk/aclk_tx_msgs.h (renamed from aclk/aclk_tx_msgs.h) | 2 | ||||
| -rw-r--r-- | src/aclk/aclk_util.c (renamed from aclk/aclk_util.c) | 0 | ||||
| -rw-r--r-- | src/aclk/aclk_util.h (renamed from aclk/aclk_util.h) | 2 | ||||
| -rw-r--r-- | src/aclk/helpers/mqtt_wss_pal.h (renamed from aclk/helpers/mqtt_wss_pal.h) | 0 | ||||
| -rw-r--r-- | src/aclk/helpers/ringbuffer_pal.h (renamed from aclk/helpers/ringbuffer_pal.h) | 0 | ||||
| -rw-r--r-- | src/aclk/https_client.c (renamed from aclk/https_client.c) | 81 | ||||
| -rw-r--r-- | src/aclk/https_client.h (renamed from aclk/https_client.h) | 13 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/agent_cmds.cc (renamed from aclk/schema-wrappers/agent_cmds.cc) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/agent_cmds.h (renamed from aclk/schema-wrappers/agent_cmds.h) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/alarm_config.cc (renamed from aclk/schema-wrappers/alarm_config.cc) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/alarm_config.h (renamed from aclk/schema-wrappers/alarm_config.h) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/alarm_stream.cc (renamed from aclk/schema-wrappers/alarm_stream.cc) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/alarm_stream.h (renamed from aclk/schema-wrappers/alarm_stream.h) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/capability.cc (renamed from aclk/schema-wrappers/capability.cc) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/capability.h (renamed from aclk/schema-wrappers/capability.h) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/connection.cc (renamed from aclk/schema-wrappers/connection.cc) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/connection.h (renamed from aclk/schema-wrappers/connection.h) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/context.cc (renamed from aclk/schema-wrappers/context.cc) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/context.h (renamed from aclk/schema-wrappers/context.h) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/context_stream.cc (renamed from aclk/schema-wrappers/context_stream.cc) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/context_stream.h (renamed from aclk/schema-wrappers/context_stream.h) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/node_connection.cc (renamed from aclk/schema-wrappers/node_connection.cc) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/node_connection.h (renamed from aclk/schema-wrappers/node_connection.h) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/node_creation.cc (renamed from aclk/schema-wrappers/node_creation.cc) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/node_creation.h (renamed from aclk/schema-wrappers/node_creation.h) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/node_info.cc (renamed from aclk/schema-wrappers/node_info.cc) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/node_info.h (renamed from aclk/schema-wrappers/node_info.h) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/proto_2_json.cc (renamed from aclk/schema-wrappers/proto_2_json.cc) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/proto_2_json.h (renamed from aclk/schema-wrappers/proto_2_json.h) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/schema_wrapper_utils.cc (renamed from aclk/schema-wrappers/schema_wrapper_utils.cc) | 0 | ||||
| -rw-r--r-- | src/aclk/schema-wrappers/schema_wrappers.h (renamed from aclk/schema-wrappers/schema_wrappers.h) | 0 |
76 files changed, 132 insertions, 1950 deletions
diff --git a/aclk/README.md b/aclk/README.md deleted file mode 100644 index c853c2324..000000000 --- a/aclk/README.md +++ /dev/null @@ -1,133 +0,0 @@ -# Agent-Cloud link (ACLK) - -The Agent-Cloud link (ACLK) is the mechanism responsible for securely connecting a Netdata Agent to your web browser -through Netdata Cloud. The ACLK establishes an outgoing secure WebSocket (WSS) connection to Netdata Cloud on port -`443`. The ACLK is encrypted, safe, and _is only established if you connect your node_. - -The Cloud App lives at app.netdata.cloud which currently resolves to the following list of IPs: - -- 54.198.178.11 -- 44.207.131.212 -- 44.196.50.41 - -> ### Caution -> ->This list of IPs can change without notice, we strongly advise you to whitelist following domains `app.netdata.cloud`, `mqtt.netdata.cloud`, if this is not an option in your case always verify the current domain resolution (e.g via the `host` command). - -For a guide to connecting a node using the ACLK, plus additional troubleshooting and reference information, read our [connect to Cloud -documentation](https://github.com/netdata/netdata/blob/master/claim/README.md). - -## Data privacy - -[Data privacy](https://netdata.cloud/privacy/) is very important to us. We firmly believe that your data belongs to -you. This is why **we don't store any metric data in Netdata Cloud**. - -All the data that you see in the web browser when using Netdata Cloud, is actually streamed directly from the Netdata Agent to the Netdata Cloud dashboard. The data passes through our systems, but it isn't stored. - -However, to be able to offer the stunning visualizations and advanced functionality of Netdata Cloud, it does store a limited number of _metadata_. Read more about our [security and privacy design](https://github.com/netdata/netdata/blob/master/docs/netdata-security.md). - -## Enable and configure the ACLK - -The ACLK is enabled by default, with its settings automatically configured and stored in the Agent's memory. No file is -created at `/var/lib/netdata/cloud.d/cloud.conf` until you either connect a node or create it yourself. The default -configuration uses two settings: - -```conf -[global] - enabled = yes - cloud base url = https://app.netdata.cloud -``` - -If your Agent needs to use a proxy to access the internet, you must [set up a proxy for -connecting to cloud](https://github.com/netdata/netdata/blob/master/claim/README.md#connect-through-a-proxy). - -You can configure following keys in the `netdata.conf` section `[cloud]`: -``` -[cloud] - statistics = yes - query thread count = 2 -``` - -- `statistics` enables/disables ACLK related statistics and their charts. You can disable this to save some space in the database and slightly reduce memory usage of Netdata Agent. -- `query thread count` specifies the number of threads to process cloud queries. Increasing this setting is useful for nodes with many children (streaming), which can expect to handle more queries (and/or more complicated queries). - -## Disable the ACLK - -You have two options if you prefer to disable the ACLK and not use Netdata Cloud. - -### Disable at installation - -You can pass the `--disable-cloud` parameter to the Agent installation when using a kickstart script -([kickstart.sh](https://github.com/netdata/netdata/blob/master/packaging/installer/methods/kickstart.md), or a [manual installation from -Git](https://github.com/netdata/netdata/blob/master/packaging/installer/methods/manual.md). - -When you pass this parameter, the installer does not download or compile any extra libraries. Once running, the Agent -kills the thread responsible for the ACLK and connecting behavior, and behaves as though the ACLK, and thus Netdata Cloud, -does not exist. - -### Disable at runtime - -You can change a runtime setting in your `cloud.conf` file to disable the ACLK. This setting only stops the Agent from -attempting any connection via the ACLK, but does not prevent the installer from downloading and compiling the ACLK's -dependencies. - -The file typically exists at `/var/lib/netdata/cloud.d/cloud.conf`, but can change if you set a prefix during -installation. To disable the ACLK, open that file and change the `enabled` setting to `no`: - -```conf -[global] - enabled = no -``` - -If the file at `/var/lib/netdata/cloud.d/cloud.conf` doesn't exist, you need to create it. - -Copy and paste the first two lines from below, which will change your prompt to `cat`. - -```bash -cd /var/lib/netdata/cloud.d -cat > cloud.conf << EOF -``` - -Copy and paste in lines 3-6, and after the final `EOF`, hit **Enter**. The final line must contain only `EOF`. Hit **Enter** again to return to your normal prompt with the newly-created file. - -To get your normal prompt back, the final line -must contain only `EOF`. - -```bash -[global] - enabled = no - cloud base url = https://app.netdata.cloud -EOF -``` - -You also need to change the file's permissions. Use `grep "run as user" /etc/netdata/netdata.conf` to figure out which -user your Agent runs as (typically `netdata`), and replace `netdata:netdata` as shown below if necessary: - -```bash -sudo chmod 0770 cloud.conf -sudo chown netdata:netdata cloud.conf -``` - -Restart your Agent to disable the ACLK. - -### Re-enable the ACLK - -If you first disable the ACLK and any Cloud functionality and then decide you would like to use Cloud, you must either -[reinstall Netdata](https://github.com/netdata/netdata/blob/master/packaging/installer/REINSTALL.md) with Cloud enabled or change the runtime setting in your -`cloud.conf` file. - -If you passed `--disable-cloud` to `netdata-installer.sh` during installation, you must -[reinstall](https://github.com/netdata/netdata/blob/master/packaging/installer/REINSTALL.md) your Agent. Use the same method as before, but pass `--require-cloud` to -the installer. When installation finishes you can [connect your node](https://github.com/netdata/netdata/blob/master/claim/README.md#how-to-connect-a-node). - -If you changed the runtime setting in your `var/lib/netdata/cloud.d/cloud.conf` file, edit the file again and change -`enabled` to `yes`: - -```conf -[global] - enabled = yes -``` - -Restart your Agent and [connect your node](https://github.com/netdata/netdata/blob/master/claim/README.md#how-to-connect-a-node). - - diff --git a/aclk/aclk-schemas/.gitignore b/aclk/aclk-schemas/.gitignore deleted file mode 100644 index bd495e9a7..000000000 --- a/aclk/aclk-schemas/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -*.pb.go - -#Agent -*.pb.cc -*.pb.h -*.pb.o -*.pb.Po -.dirstamp - -#Jetbrains -.idea diff --git a/aclk/aclk-schemas/.travis.yml b/aclk/aclk-schemas/.travis.yml deleted file mode 100644 index 7c99550fe..000000000 --- a/aclk/aclk-schemas/.travis.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -language: minimal -install: make deps -script: make CI diff --git a/aclk/aclk-schemas/LICENSE b/aclk/aclk-schemas/LICENSE deleted file mode 100644 index f288702d2..000000000 --- a/aclk/aclk-schemas/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<https://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<https://www.gnu.org/licenses/why-not-lgpl.html>. diff --git a/aclk/aclk-schemas/Makefile b/aclk/aclk-schemas/Makefile deleted file mode 100644 index 8f4003070..000000000 --- a/aclk/aclk-schemas/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -SHELL := /usr/bin/env bash -o pipefail - -# This controls the location of the cache. -PROJECT := cloud-schemas -# This controls the remote HTTPS git location to compare against for breaking changes in CI. -# -# Most CI providers only clone the branch under test and to a certain depth, so when -# running buf check breaking in CI, it is generally preferable to compare against -# the remote repository directly. -# -# Basic authentication is available, see https://buf.build/docs/inputs#https for more details. -HTTPS_GIT := https://github.com/netdata/cloud-schemas.git - -# This controls the version of buf to install and use. -BUF_VERSION := 0.6.0 - -### Everything below this line is meant to be static, i.e. only adjust the above variables. ### - -UNAME_OS := $(shell uname -s) -UNAME_ARCH := $(shell uname -m) -# Buf will be cached to ~/.cache/buf-example. -CACHE_BASE := $(HOME)/.cache/$(PROJECT) -# This allows switching between i.e a Docker container and your local setup without overwriting. -CACHE := $(CACHE_BASE)/$(UNAME_OS)/$(UNAME_ARCH) -# The location where buf will be installed. -CACHE_BIN := $(CACHE)/bin -# Marker files are put into this directory to denote the current version of binaries that are installed. -CACHE_VERSIONS := $(CACHE)/versions - -# Update the $PATH so we can use buf directly -export PATH := $(abspath $(CACHE_BIN)):$(PATH) - -# BUF points to the marker file for the installed version. -# -# If BUF_VERSION is changed, the binary will be re-downloaded. -BUF := $(CACHE_VERSIONS)/buf/$(BUF_VERSION) -$(BUF): - @rm -f $(CACHE_BIN)/buf - @mkdir -p $(CACHE_BIN) - curl -sSL \ - "https://github.com/bufbuild/buf/releases/download/v$(BUF_VERSION)/buf-$(UNAME_OS)-$(UNAME_ARCH)" \ - -o "$(CACHE_BIN)/buf" - chmod +x "$(CACHE_BIN)/buf" - @rm -rf $(dir $(BUF)) - @mkdir -p $(dir $(BUF)) - @touch $(BUF) - -.DEFAULT_GOAL := local - -# deps allows us to install deps without running any checks. - -.PHONY: deps -deps: $(BUF) - -# local is what we run when testing locally. -# This does breaking change detection against our local git repository. - -.PHONY: local -local: $(BUF) - buf check lint ./proto - buf check breaking --against '.git#branch=master' - -# https is what we run when testing in most CI providers. -# This does breaking change detection against our git repository. - -.PHONY: CI -CI: $(BUF) - buf check lint ./proto - buf check breaking --against ".git#branch=master" - -.PHONY: clean -clean: - git clean -xdf - rm -rf $(CACHE_BASE)
\ No newline at end of file diff --git a/aclk/aclk-schemas/README.md b/aclk/aclk-schemas/README.md deleted file mode 100644 index aa6188977..000000000 --- a/aclk/aclk-schemas/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# aclk-schemas -Protobuf schemas used in ACLK connection diff --git a/aclk/aclk-schemas/buf.yml b/aclk/aclk-schemas/buf.yml deleted file mode 100644 index 532053d91..000000000 --- a/aclk/aclk-schemas/buf.yml +++ /dev/null @@ -1,9 +0,0 @@ -build: - roots: - - proto -lint: - use: - - DEFAULT -breaking: - use: - - FILE diff --git a/aclk/aclk-schemas/proto/aclk/v1/lib.proto b/aclk/aclk-schemas/proto/aclk/v1/lib.proto deleted file mode 100644 index f32c32c6e..000000000 --- a/aclk/aclk-schemas/proto/aclk/v1/lib.proto +++ /dev/null @@ -1,22 +0,0 @@ -syntax = "proto3"; - -package aclk_lib.v1; - -import "google/protobuf/timestamp.proto"; - -option go_package = "aclk_lib/v1;aclklib"; - -// ACLKMessagePosition is used by sequenced messages to define their exact position -message ACLKMessagePosition { - uint64 sequence_id = 1; - // auto generated in Agent's DB upon sequence_id creation - google.protobuf.Timestamp seq_id_created_at = 2; - uint64 previous_sequence_id = 3; -} - -message Capability { - string name = 1; - uint32 version = 2; - // version == 0 is equivalent to not having the capability at all - bool enabled = 3; -} diff --git a/aclk/aclk-schemas/proto/agent/v1/cmds.proto b/aclk/aclk-schemas/proto/agent/v1/cmds.proto deleted file mode 100644 index c37c00c3a..000000000 --- a/aclk/aclk-schemas/proto/agent/v1/cmds.proto +++ /dev/null @@ -1,79 +0,0 @@ -syntax = "proto3"; -option go_package = "agent/v1;agent"; - -package agent.v1; - -import "google/protobuf/timestamp.proto"; -import "proto/aclk/v1/lib.proto"; - -message CancelPendingRequest { - // must match the ID sent with the request originally made - // other than this agent will not put conditions on it - // and will treat it as opaque string (it simply has to match) - // However this doesn't mean there are no conditions on the id - // made on the request side - string request_id = 1; - - // time when the cancellation request was generated - google.protobuf.Timestamp timestamp = 2; - - // optional might be useful for debugging purposes - string trace_id = 3; -} - -// AgentCommand is sent from the Cloud to the Agent at `/agent/{claim_id}/inbound/v1/cmd/AgentCommand` -// the message includes the resource that the Cloud needs to GET from the Agent HTTP API along with related metadata -message AgentCommand { - // the topic to which the Cloud awaits for the AgentCommandResponse. - // example: `/svc/agent-data-ctrl/2d7b7edd-561e-4aec-8ac1-466a585520f5/resp` - string callback_topic = 1; - // the topic to which the Cloud awaits for the AgentCommandAck. - // example: `/svc/agent-data-ctrl/2d7b7edd-561e-4aec-8ac1-466a585520f5/resp` - string ack_topic = 2; - // unique identifier for the AgentCommand - // example: `617038b3-7c2a-4617-a78f-ab37bd820198` - string message_id = 3; - // defined in milliseconds, the time the Agent has to respond before Cloud - // considering the request as timed-out - // example: `60000` - uint64 timeout = 4; - // defined in milliseconds, the time the Agent has to send back to the Cloud - // an AgentCommandAck message signaling that is still working on the request - // example: `3000` - uint64 ack_timeout = 5; - // the requested Agent resource - // example: `/api/v2/data?query_params_go_here` - string resource = 6; -} - -// AgentCommandAck is sent from the Agent to the Cloud at predefined intervals (`AgentCommand.ack_timeout`) to predefined topic (`AgentCommand.ack_topic`) -// signaling that the Agent is still working to serve an AgentCommand (referenced by the message_id) that the Cloud sent -message AgentCommandAck { - // unique identifier to reference AgentCommand on which the Agent is still working on serving - // example: `617038b3-7c2a-4617-a78f-ab37bd820198` - string message_id = 1; - // the timestamp when the Agent created this AgentCommandAck message - google.protobuf.Timestamp created_at = 2; - // integer revealing the progress of completion to serve the AgentCommand with the given message_id - // example: `25` - uint32 progress_percent = 3; -} - -// AgentCommandResponse is sent from the Agent to the Cloud at `/agent/{claim_id}/inbound/v1/cmd/AgentCommand` -// the message includes the resource that the Cloud needs to GET from the Agent HTTP API along with related metadata -message AgentCommandResponse { - // unique identifier for the AgentCommand - // example: `617038b3-7c2a-4617-a78f-ab37bd820198` - string message_id = 1; - // the (http) status code of the Agent's API response - // example: `200` - uint32 status_code = 2; - // the dumped raw (http) response the Agent's API returned - bytes response = 3; - // the Agent's timestamp (aka legacy `timestamp`) - google.protobuf.Timestamp timestamp = 4; - // the timestamp when the Agent received the AgentCommand for execution (aka legacy `t-rx`) - google.protobuf.Timestamp received_at = 5; - // the amount of microseconds the Agent needed to execute the HTTP request of the AgentCommand (aka legacy`t-exec`) - uint64 exec_time = 6; -} diff --git a/aclk/aclk-schemas/proto/agent/v1/connection.proto b/aclk/aclk-schemas/proto/agent/v1/connection.proto deleted file mode 100644 index 4321b0b90..000000000 --- a/aclk/aclk-schemas/proto/agent/v1/connection.proto +++ /dev/null @@ -1,59 +0,0 @@ -syntax = "proto3"; -option go_package = "agent/v1;agent"; - -package agent.v1; - -import "google/protobuf/timestamp.proto"; -import "google/protobuf/duration.proto"; -import "proto/aclk/v1/lib.proto"; - -message UpdateAgentConnection { - string claim_id = 1; - bool reachable = 2; - - int64 session_id = 3; - - ConnectionUpdateSource update_source = 4; - - // mqtt_broker_addr shard to use for reaching the agent - // cloud injects this information - string mqtt_broker_addr = 5; - - google.protobuf.Timestamp updated_at = 6; - - // vmq_instance_id broker shard to use for reaching the agent - // cloud injects this information - int32 vmq_instance_id = 7; - - // > 15 optional fields: - // How long the system was running until connection (only applicable when reachable=true) - google.protobuf.Duration system_uptime = 15; - - // How long the netdata agent was running until connection (only applicable when reachable=true) - google.protobuf.Duration agent_uptime = 16; - - repeated aclk_lib.v1.Capability capabilities = 17; -} - -message SendNodeInstances { - string claim_id = 1; - Config config = 2; -} - -// ConnectionUpdateSource is to determine whether the connection update was issued -enum ConnectionUpdateSource { - // CONNECTION_UPDATE_SOURCE_UNSPECIFIED acts as default value for protobuf and is never specified - CONNECTION_UPDATE_SOURCE_UNSPECIFIED = 0; - // CONNECTION_UPDATE_SOURCE_AGENT A direct message from an agent - CONNECTION_UPDATE_SOURCE_AGENT = 1; - // CONNECTION_UPDATE_SOURCE_LWT message delivered as the Last Will and Testiment from MQTT broker if an agent connection with the broker is lost - CONNECTION_UPDATE_SOURCE_LWT = 2; - // CONNECTION_UPDATE_SOURCE_HEURISTIC A cloud generated message to sanitize incorrect internal state - CONNECTION_UPDATE_SOURCE_HEURISTIC = 3; -} - -message Config { - bool bearer_protection = 1; - bool cloud_only_notifications = 2; - bool universal_dashboards = 3; -} diff --git a/aclk/aclk-schemas/proto/agent/v1/disconnect.proto b/aclk/aclk-schemas/proto/agent/v1/disconnect.proto deleted file mode 100644 index 852ef702a..000000000 --- a/aclk/aclk-schemas/proto/agent/v1/disconnect.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; - -package agent.v1; - -import "google/protobuf/timestamp.proto"; - -option go_package = "agent/v1;agent"; - -// Sent by Cloud to instruct Agent to disconnect ASAP -message DisconnectReq { - uint64 reconnect_after_seconds = 1; - bool permaban = 2; - google.protobuf.Timestamp created_at = 3; - uint32 error_code = 4; - string error_description = 5; -} diff --git a/aclk/aclk-schemas/proto/alarm/v1/config.proto b/aclk/aclk-schemas/proto/alarm/v1/config.proto deleted file mode 100644 index 430078fcf..000000000 --- a/aclk/aclk-schemas/proto/alarm/v1/config.proto +++ /dev/null @@ -1,61 +0,0 @@ -syntax = "proto3"; - -package alarms.v1; - -option go_package = "alarms/v1;alarms"; - -message SendAlarmConfiguration{ - string config_hash = 1; -} - -message ProvideAlarmConfiguration { - string config_hash = 1; - AlarmConfiguration config = 2; -} - -message AlarmConfiguration{ - string alarm = 1; - string template = 2; - string on_chart = 3; - - string classification = 4; - string type = 5; - string component = 6; - - string os = 7; - string hosts = 8; - string plugin = 9; - string module = 10; - string charts = 11; - string families = 12; - string lookup = 13; - string every = 14; - string units = 15; - - string green = 16; - string red = 17; - - string calculation_expr = 18; - string warning_expr = 19; - string critical_expr = 20; - - string recipient = 21; - string exec = 22; - string delay = 23; - string repeat = 24; - string info = 25; - string options = 26; - string host_labels = 27; - - //parsed values from above config values - //indicated by p_ - int32 p_db_lookup_after = 28; - int32 p_db_lookup_before = 29; - string p_db_lookup_dimensions = 30; - string p_db_lookup_method = 31; - string p_db_lookup_options = 32; - int32 p_update_every = 33; - - string chart_labels = 34; - string summary = 35; -} diff --git a/aclk/aclk-schemas/proto/alarm/v1/stream.proto b/aclk/aclk-schemas/proto/alarm/v1/stream.proto deleted file mode 100644 index 44f190682..000000000 --- a/aclk/aclk-schemas/proto/alarm/v1/stream.proto +++ /dev/null @@ -1,148 +0,0 @@ -syntax = "proto3"; - -package alarms.v1; - -import "google/protobuf/timestamp.proto"; - -option go_package = "alarms/v1;alarms"; - -message SendAlarmLogHealth { - string node_id = 1; -} - -message AlarmLogHealth { - string claim_id = 1; - string node_id = 2; - bool enabled = 3; - AlarmLogStatus status = 4; - LogEntries log_entries = 5; -} - -message LogEntries { - int64 first_sequence_id = 1; - google.protobuf.Timestamp first_when = 2; - - int64 last_sequence_id = 3; - google.protobuf.Timestamp last_when = 4; -} - -enum AlarmLogStatus { - ALARM_LOG_STATUS_UNSPECIFIED = 0; - ALARM_LOG_STATUS_RUNNING = 1; - ALARM_LOG_STATUS_IDLE = 2; -} - -message StartAlarmStreaming { - string node_id = 1; - uint64 batch_id = 2 [deprecated=true]; - uint64 start_sequnce_id = 3 [deprecated=true]; - // Instructs the agent to sync all configured alarms - bool resets = 4; -} - -message SendAlarmCheckpoint { - string node_id = 1; - string claim_id = 2; -} - -message AlarmCheckpoint { - string node_id = 1; - string claim_id = 2; - bytes checksum = 3; -} - -message AlarmLogEntry { - string node_id = 1; - string claim_id = 2; - - // The chart's id field - string chart = 3; - string name = 4; - string family = 5; - uint64 batch_id = 6 [deprecated=true]; - uint64 sequence_id = 7 [deprecated=true]; - uint64 when = 8; - - string config_hash = 9; - - int32 utc_offset = 10; - string timezone = 11; - - // Paths that can be custom for the same alarm, but depend on installation path for each user. Should be here or in config ? - string exec_path = 12; - string conf_source = 13; - string command = 14; - - // In seconds, uint32 is safe ? - uint32 duration = 15; - uint32 non_clear_duration = 16; - - AlarmStatus status = 17; - AlarmStatus old_status = 18; - uint64 delay = 19; - uint64 delay_up_to_timestamp = 20; - // Todo: verify that we need these. sequence_id doesn't suffice? - // uint64 updated_by_id = 12; - // uint64 updates_id = 13; - uint64 last_repeat = 21; - bool silenced = 22; - - // Check if string values are needed - string value_string = 23; - string old_value_string = 24; - - double value = 25; - double old_value = 26; - - // Updated alarm entry, when the status of the alarm has been updated by a later entry - bool updated = 27; - - // Rendered_info - string rendered_info = 28; - - // The chart's context field - string chart_context = 29; - - // Counter of alert transitions for this alert chain - uint64 event_id = 30; - - // A unique uuid for this alert event - string transition_id = 31; - - // The chart's name field - string chart_name = 32; - - // The rendered summary - string summary = 33; -} - -enum AlarmStatus { - ALARM_STATUS_NULL = 0; - ALARM_STATUS_UNKNOWN = 1; - ALARM_STATUS_REMOVED = 2; - ALARM_STATUS_NOT_A_NUMBER = 3; - ALARM_STATUS_CLEAR = 4; - ALARM_STATUS_WARNING = 5; - ALARM_STATUS_CRITICAL = 6; -} - -// SendAlarmSnapshot: send from cloud to the agent, to initiate an AlarmSnapshot image of current alarms back to the cloud -message SendAlarmSnapshot { - string node_id = 1; - string claim_id = 2; - uint64 snapshot_id = 3 [deprecated=true]; - uint64 sequence_id = 4 [deprecated=true]; - string snapshot_uuid = 5; -} - -// Agent responds with AlarmSnapshot to a SendAlarmSnapshot message -message AlarmSnapshot{ - string node_id = 1; - string claim_id = 2; - uint64 snapshot_id = 3 [deprecated=true]; // Same id from SendAlarmSnapshot message - uint32 chunks = 4; // In case full snapshot can not fit in a single message, indicates the total number of messages for this snapshot_id - uint32 chunk_size = 5; // How many alerts this chunk contains - uint32 chunk = 6; // Chunk index of this message - repeated AlarmLogEntry alarms = 7; // a list of AlarmLogEntry's - string snapshot_uuid = 8; -} diff --git a/aclk/aclk-schemas/proto/chart/v1/config.proto b/aclk/aclk-schemas/proto/chart/v1/config.proto deleted file mode 100644 index f0c5e3a35..000000000 --- a/aclk/aclk-schemas/proto/chart/v1/config.proto +++ /dev/null @@ -1,37 +0,0 @@ -syntax = "proto3"; - -package chart.v1; - -option go_package = "chart/config/v1;chartconfig"; - -// UpdateChartConfigs command contains the list of missing chart configs from the cloud to agent -message UpdateChartConfigs { - // claim_id, node_id pair is used to identify the Node Instance - string claim_id = 1; - string node_id = 2; - // list of config hashes missing from cloud and requested from the agent - repeated string config_hashes = 3; -} - -message ChartConfigsUpdated { - repeated ChartConfigUpdated configs = 1; -} - -message ChartConfigUpdated { - string type = 1; - string family = 2; - string context = 3; - string title = 4; - uint64 priority = 5; - string plugin = 6; - string module = 7; - ChartType chart_type = 8; - string units = 9; - string config_hash = 10; -} - -enum ChartType { - LINE = 0; - AREA = 1; - STACKED = 2; -} diff --git a/aclk/aclk-schemas/proto/chart/v1/dimension.proto b/aclk/aclk-schemas/proto/chart/v1/dimension.proto deleted file mode 100644 index 8bcb564b8..000000000 --- a/aclk/aclk-schemas/proto/chart/v1/dimension.proto +++ /dev/null @@ -1,24 +0,0 @@ -syntax = "proto3"; - -package chart.v1; - -import "google/protobuf/timestamp.proto"; - -import "proto/aclk/v1/lib.proto"; - -option go_package = "chart/dimension/v1;chartdimension"; - -// ChartDimensionUpdated is a single event sent from the Agent to the Cloud containing chart dimension data. -// -// ChartDimensionUpdated messages are dispatched in bulk to the Cloud wrapped in ChartsAndDimensionsUpdated messages. -message ChartDimensionUpdated { - string id = 1; - string chart_id = 2; - string node_id = 3; - string claim_id = 4; - string name = 5; - google.protobuf.Timestamp created_at = 6; - // null value means that the dimension is currently collected (live) - google.protobuf.Timestamp last_timestamp = 7; - aclk_lib.v1.ACLKMessagePosition position = 8; -} diff --git a/aclk/aclk-schemas/proto/chart/v1/instance.proto b/aclk/aclk-schemas/proto/chart/v1/instance.proto deleted file mode 100644 index 25c99e7c7..000000000 --- a/aclk/aclk-schemas/proto/chart/v1/instance.proto +++ /dev/null @@ -1,32 +0,0 @@ -syntax = "proto3"; - -package chart.v1; - -import "proto/aclk/v1/lib.proto"; - -option go_package = "chart/instance/v1;chartinstance"; - -// ChartInstanceUpdated is a single event sent from the Agent to the Cloud containing chart instance data. -// -// ChartInstanceUpdated messages are dispatched in bulk to the Cloud wrapped in ChartsAndDimensionsUpdated messages. -message ChartInstanceUpdated { - string id = 1; - string claim_id = 2; - string node_id = 3; - string name = 4; - map<string, string> chart_labels = 5; - MemoryMode memory_mode = 6; - // in seconds - uint32 update_every_interval = 7; - string config_hash = 8; - aclk_lib.v1.ACLKMessagePosition position = 9; -} - -enum MemoryMode { - NONE = 0; - RAM = 1; - MAP = 2; - SAVE = 3; - ALLOC = 4; - DB_ENGINE = 5; -} diff --git a/aclk/aclk-schemas/proto/chart/v1/stream.proto b/aclk/aclk-schemas/proto/chart/v1/stream.proto deleted file mode 100644 index 9473538f2..000000000 --- a/aclk/aclk-schemas/proto/chart/v1/stream.proto +++ /dev/null @@ -1,86 +0,0 @@ -syntax = "proto3"; - -package chart.v1; - -import "google/protobuf/timestamp.proto"; - -import "proto/chart/v1/instance.proto"; -import "proto/chart/v1/dimension.proto"; - -option go_package = "chart/stream/v1;chartstream"; - -// StreamChartsAndDimensions is a Command produced by the Cloud, consumed by the Agent. -// -// It instructs the Agent to start sending ChartsAndDimensionsUpdated messages for a NodeInstance -// after the last sequence_id that the Cloud has successfully ingested. -message StreamChartsAndDimensions { - // claim_id, node_id pair is used to identify the Node Instance - string claim_id = 1; - string node_id = 2; - - // sequence_id last verified sequence sent by the Agent - uint64 sequence_id = 3; - // batch_id identifies the stream_id and gets incremented every time the Cloud sends a new StreamChartsAndDimensions command - uint64 batch_id = 4; - // seq_id_created_at autogenerated timestamp in Agent's DB upon sequence_id creation - google.protobuf.Timestamp seq_id_created_at = 5; -} - - -// ChartsAndDimensionsAck is an Event produced by the Cloud, consumed by the Agent. -// -// This Event is an acknowledgment from the Cloud side that Chart messages up to a specific last_sequence_id -// have been successfully ingested, and could be potentially deleted from the Agent's DB. -message ChartsAndDimensionsAck { - string claim_id = 1; - string node_id = 2; - // the last verified stored message's seq_id - uint64 last_sequence_id = 3; -} - -// ResetChartMessages is a Command produced by the Agent, consumed by the Cloud. -// -// This Command instructs the Cloud to clear its Chart state for a specific NodeInstance and re-sync -// because of a ResetReason. -message ResetChartMessages { - // claim_id, node_id pair is used to identify the Node Instance - string claim_id = 1; - string node_id = 2; - - ResetReason reason = 3; -} - -enum ResetReason { - DB_EMPTY = 0; - SEQ_ID_NOT_EXISTS = 1; - TIMESTAMP_MISMATCH = 2; -} - -// ChartsAndDimensionsUpdated is a wrapper Event (`fat` message) produced by the Agent, consumed by the Cloud. -// -// It potentially includes a collection of ChartInstanceUpdated messages and|or a collection of ChartDimensionUpdated messages. -message ChartsAndDimensionsUpdated { - repeated chart.v1.ChartInstanceUpdated charts = 1; - repeated chart.v1.ChartDimensionUpdated dimensions = 2; - uint64 batch_id = 3; -} - -// RetentionUpdated includes the available retentions (in seconds) of the dimensions - of a specific node instance and memory-mode - -// on a per update_every level. -// This message is sent over upon Agent Database rotation events to inform the Cloud in total about the newly updated data retentions -// of a node instance's dimensions. -message RetentionUpdated { - // claim_id, node_id pair is used to identify the Node Instance - string claim_id = 1; - string node_id = 2; - // the memory_mode used by the node instance's chart instances - chart.v1.MemoryMode memory_mode = 3; - // this mapping identifies the newly updated available retention (in seconds) of the node instance's dimensions - // the keys are the update_every categories of various dimensions (1, 2, 4, 10 etc.), - // and the values are the available retention (in seconds) of each dimension belonging to the update_every category - // denoted by the key - map<uint32, uint32> interval_durations = 4; - // the timestamp when the db rotation event took place. Can be used in conjunction with the interval_durations - // to compute the beginning of each `updated_every` group's retention - google.protobuf.Timestamp rotation_timestamp = 5; -} diff --git a/aclk/aclk-schemas/proto/context/v1/context.proto b/aclk/aclk-schemas/proto/context/v1/context.proto deleted file mode 100644 index eb771f8eb..000000000 --- a/aclk/aclk-schemas/proto/context/v1/context.proto +++ /dev/null @@ -1,57 +0,0 @@ -syntax = "proto3"; - -package context.v1; - -option go_package = "context/v1;context"; - -// ContextsUpdated is an Event produced by the Agent, consumed by the Cloud. -// -// it contains a collection of ContextUpdated messages for a specific NodeInstance. -message ContextsUpdated { - // contexUpdates contains the collection of context updates - repeated ContextUpdated contextUpdates = 1; - // claim_id, node_id pair identifies the node instance - string claim_id = 2; - string node_id = 3; - // version_hash is the contexts version_hash result the cloud should - // get after applying this message updates. - uint64 version_hash = 4; - // it's and always increasing number to compare - // which version_hash is more recent between multiple - // ContextsUpdated messages. Bigger means more recent. - uint64 created_at = 5; -} - -// ContextUpdated contains context data. -message ContextUpdated { - // context id - string id = 1; - // context version is an epoch in seconds. - uint64 version = 2; - // first_entry, last_entry are epochs in seconds - uint64 first_entry = 3; - uint64 last_entry = 4; - // deleted flag is used to signal a context deletion - bool deleted = 5; - // context configuration fields - string title = 6; - uint64 priority = 7; - string chart_type = 8; - string units = 9; - string family = 10; -} - -// ContextsSnapshot is an Event produced by the Agent, consumed by the Cloud. -// -// it contains a snapshot of the existing contexts on the Agent. -// snapshot version and context versions are epochs in seconds so we can -// identify if a context version was generated after a specific snapshot. -message ContextsSnapshot { - // contexts contains the collection of existing contexts - repeated ContextUpdated contexts = 1; - // claim_id, node_id pair identifies the node instance - string claim_id = 2; - string node_id = 3; - // version is an epoch in seconds - uint64 version = 4; -} diff --git a/aclk/aclk-schemas/proto/context/v1/stream.proto b/aclk/aclk-schemas/proto/context/v1/stream.proto deleted file mode 100644 index a6e7e3abf..000000000 --- a/aclk/aclk-schemas/proto/context/v1/stream.proto +++ /dev/null @@ -1,34 +0,0 @@ -syntax = "proto3"; - -package context.v1; - -option go_package = "context/v1;context"; - -// ContextsCheckpoint is a Command produced by the Cloud, consumed by the Agent. -// -// It informs the Agent the contexts' version_hash that the cloud has for a specific NodeInstance. -message ContextsCheckpoint { - // claim_id, node_id pair is used to identify the NodeInstance. - string claim_id = 1; - string node_id = 2; - // version_hash tells the Agent the current version hash for the contexts received - // if the version hash calculated by the Agent is different, Agent will request - // to re-sync all contexts. - uint64 version_hash= 3; -} - -// StopStreamingContexts is a Command produced by the Cloud, consumed by the Agent. -// -// It instructs the Agent to stop sending ContextsUpdated messages for a NodeInstance -// due to a reason. -message StopStreamingContexts { - // claim_id, node_id pair is used to identify the node instance - string claim_id = 1; - string node_id = 2; - - StopStreamingContextsReason reason = 3; -} - -enum StopStreamingContextsReason { - RATE_LIMIT_EXCEEDED = 0; -} diff --git a/aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.proto b/aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.proto deleted file mode 100644 index f0c02461e..000000000 --- a/aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.proto +++ /dev/null @@ -1,37 +0,0 @@ -syntax = "proto3"; -option go_package = "nodeinstance/connection/v1;nodeinstanceconnection"; - -package nodeinstance.v1; - -import "google/protobuf/timestamp.proto"; -import "proto/aclk/v1/lib.proto"; - -message UpdateNodeInstanceConnection { - string claim_id = 1; - string node_id = 2; - - // liveness whether node data are actively streamed to the agent. - bool liveness = 3; - - // queryable whether the agent has data about the node. - bool queryable = 4; - - int64 session_id = 5; - - google.protobuf.Timestamp updated_at = 6; - - // mqtt_broker_addr shard to use for reaching the agent - // cloud injects this information. - string mqtt_broker_addr = 7; - - // vmq_instance_id broker shard to use for reaching the agent - // cloud injects this information. - int32 vmq_instance_id = 8; - - // hops is the number of streaming hops between collection of node data - // and the claimed agent. Zero if no streaming is involved. - int32 hops = 9; - - // capabilities of node instance NOT the NODE or agent!!! - repeated aclk_lib.v1.Capability capabilities = 10; -} diff --git a/aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.proto b/aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.proto deleted file mode 100644 index 922337154..000000000 --- a/aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.proto +++ /dev/null @@ -1,32 +0,0 @@ -syntax = "proto3"; -option go_package = "node_instance/creation/v1;node_instancecreation"; - -package nodeinstance.create.v1; - -message CreateNodeInstance { - // Claim ID of the Agent the Node Instance belongs to. - // Eventually, the NodeInstance will be identified by the compilation of - // this claim_id and NodeID returned by `CreateNodeInstanceResult` - string claim_id = 1; - // Machine GUID of the Machine the request comes from - // Used to look for an existing NodeID in the space claim_id belongs to - string machine_guid = 2; - string hostname = 3; - - // vmq_instance_id broker shard to use for reaching the agent - // cloud injects this information. - int32 vmq_instance_id = 4; - // mqtt_broker_addr shard to use for reaching the agent - // cloud injects this information. - string mqtt_broker_addr = 5; - - // hops is the number of streaming hops between collection of node data - // and the claimed agent. Zero if no streaming is involved. - int32 hops = 6; -} - -message CreateNodeInstanceResult { - string node_id = 1; - string machine_guid = 2; -} - diff --git a/aclk/aclk-schemas/proto/nodeinstance/info/v1/info.proto b/aclk/aclk-schemas/proto/nodeinstance/info/v1/info.proto deleted file mode 100644 index 7aa9d0448..000000000 --- a/aclk/aclk-schemas/proto/nodeinstance/info/v1/info.proto +++ /dev/null @@ -1,148 +0,0 @@ -syntax = "proto3"; -option go_package = "node_instance/info/v1;nodeinstanceinfo"; - -package nodeinstance.info.v1; - -import "google/protobuf/timestamp.proto"; -import "proto/aclk/v1/lib.proto"; - -// UpdateNodeInfo (Command) -// -// pulsar topic: `UpdateNodeInfo` (sharded) -// -// key: `claim_id,node_id` -// -// Publishers: `netdata/agent` -// Subscribers: `cloud-node-mqtt-output-service` -// -// When: -// On nodeinstance connect -// -message UpdateNodeInfo { - string node_id = 7; - - string claim_id = 1; - - NodeInfo data = 2; - // to be obsoleted in future - // all new fields should go into node_info - // or node_instance_info respectively - - google.protobuf.Timestamp updated_at = 3; - - int64 session_id = 4; - - string machine_guid = 5; - - bool child = 6; - - MachineLearningInfo ml_info = 8; - // to be obsoleted in far future - - NodeInfo2 node_info = 9; - // node_info shows data about actual node - // for example feature (ml) for this - // node (child) might be available/enabled on the node (child) directly - // but not available trough the parent (node_instance) - - NodeInstanceInfo node_instance_info = 10; - // info specific to the node_instance for this node available trough agent - // who sends this message. - // e.g. machine learning is enabled for this node and processing is done - // by the actual agent (parent). (child itself might or might not be - // ml ml_capable by itself (see node_info)) -} - -message NodeInfo2 { - repeated aclk_lib.v1.Capability capabilities = 1; -} - -message NodeInstanceInfo { - repeated aclk_lib.v1.Capability capabilities = 1; -} - -// NodeInfo describes the metadata of a node -message NodeInfo { - string name = 1; - - string os = 2; - string os_name = 3; - string os_version = 4; - - string kernel_name = 5; - string kernel_version = 6; - - string architecture = 7; - - // number of cpu cores in the node - uint32 cpus = 8; - - // human readable (value + unit) frequency of cpu - string cpu_frequency = 9; - - // human readable (value + unit) size of node's memory - string memory = 10; - - // human readable (value + unit) size of all (sum) node's disks - string disk_space = 11; - - // version of the netdata agent - string version = 12; - - // release channel of netdata agent (example: nightly) - string release_channel = 13; - - string timezone = 14; - - // virtualization_type example: kvm (optional) - string virtualization_type = 15; - - // container_type example: docker (optional) - string container_type = 16; - - string custom_info = 17; - - // [Obsolete] repeated string services = 18; - reserved 18; - - string machine_guid = 19; - - // [Obsolete] repeated MirroredHostStatus mirrored_hosts_status = 20; - reserved 20; - - map<string, string> host_labels = 21; - - MachineLearningInfo ml_info = 22; - - // [Obsolete] repeated string collectors = 23; - reserved 23; -} - -message MachineLearningInfo { - // have ML capability - bool ml_capable = 1; - - // runs ML functionality - bool ml_enabled = 2; -} - -// UpdateNodeCollectors (Command) -// -// key: `claim_id,node_id` -// -// Publishers: `netdata/agent` -// -// When: -// On nodeinstance connect (after agent settles) and on detection of change of collectors -// - -message CollectorInfo { - string module = 1; - string plugin = 2; -} - -message UpdateNodeCollectors { - string claim_id = 1; - string node_id = 2; - repeated CollectorInfo collectors = 3; -} diff --git a/aclk/schema-wrappers/schema_wrapper_utils.h b/aclk/schema-wrappers/schema_wrapper_utils.h deleted file mode 100644 index 2815d0f20..000000000 --- a/aclk/schema-wrappers/schema_wrapper_utils.h +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-or-later - -#ifndef SCHEMA_WRAPPER_UTILS_H -#define SCHEMA_WRAPPER_UTILS_H - -#include "database/rrd.h" - -#include <sys/time.h> -#include <google/protobuf/timestamp.pb.h> -#include <google/protobuf/map.h> - -#if GOOGLE_PROTOBUF_VERSION < 3001000 -#define PROTO_COMPAT_MSG_SIZE(msg) (size_t)msg.ByteSize(); -#define PROTO_COMPAT_MSG_SIZE_PTR(msg) (size_t)msg->ByteSize(); -#else -#define PROTO_COMPAT_MSG_SIZE(msg) msg.ByteSizeLong(); -#define PROTO_COMPAT_MSG_SIZE_PTR(msg) msg->ByteSizeLong(); -#endif - -void set_google_timestamp_from_timeval(struct timeval tv, google::protobuf::Timestamp *ts); -void set_timeval_from_google_timestamp(const google::protobuf::Timestamp &ts, struct timeval *tv); -int label_add_to_map_callback(const char *name, const char *value, RRDLABEL_SRC ls, void *data); - -#endif /* SCHEMA_WRAPPER_UTILS_H */ diff --git a/aclk/aclk.c b/src/aclk/aclk.c index e95d7d6ab..991745491 100644 --- a/aclk/aclk.c +++ b/src/aclk/aclk.c @@ -4,7 +4,7 @@ #ifdef ENABLE_ACLK #include "aclk_stats.h" -#include "mqtt_wss_client.h" +#include "mqtt_websockets/mqtt_wss_client.h" #include "aclk_otp.h" #include "aclk_tx_msgs.h" #include "aclk_query.h" @@ -817,10 +817,6 @@ void *aclk_main(void *ptr) unsigned int proto_hdl_cnt = aclk_init_rx_msg_handlers(); - // This thread is unusual in that it cannot be cancelled by cancel_main_threads() - // as it must notify the far end that it shutdown gracefully and avoid the LWT. - netdata_thread_disable_cancelability(); - #if defined( DISABLE_CLOUD ) || !defined( ENABLE_ACLK ) nd_log(NDLS_DAEMON, NDLP_INFO, "Killing ACLK thread -> cloud functionality has been disabled"); @@ -861,13 +857,10 @@ void *aclk_main(void *ptr) aclk_stats_enabled = config_get_boolean(CONFIG_SECTION_CLOUD, "statistics", global_statistics_enabled); if (aclk_stats_enabled) { stats_thread = callocz(1, sizeof(struct aclk_stats_thread)); - stats_thread->thread = mallocz(sizeof(netdata_thread_t)); stats_thread->query_thread_count = query_threads.count; stats_thread->client = mqttwss_client; aclk_stats_thread_prepare(query_threads.count, proto_hdl_cnt); - netdata_thread_create( - stats_thread->thread, "ACLK_STATS", NETDATA_THREAD_OPTION_JOINABLE, aclk_stats_main_thread, - stats_thread); + stats_thread->thread = nd_thread_create("ACLK_STATS", NETDATA_THREAD_OPTION_JOINABLE, aclk_stats_main_thread, stats_thread); } // Keep reconnecting and talking until our time has come @@ -901,9 +894,8 @@ exit_full: aclk_query_threads_cleanup(&query_threads); if (aclk_stats_enabled) { - netdata_thread_join(*stats_thread->thread, NULL); + nd_thread_join(stats_thread->thread); aclk_stats_thread_cleanup(); - freez(stats_thread->thread); freez(stats_thread); } free_topic_cache(); @@ -919,7 +911,7 @@ exit: void aclk_host_state_update(RRDHOST *host, int cmd, int queryable) { - uuid_t node_id; + nd_uuid_t node_id; int ret = 0; if (!aclk_connected) @@ -1165,7 +1157,7 @@ char *aclk_state(void) buffer_strcat(wb, "\n\tAlert Streaming Status:"); fill_alert_status_for_host(wb, host); } - rrd_unlock(); + rrd_rdunlock(); } ret = strdupz(buffer_tostring(wb)); @@ -1315,7 +1307,7 @@ char *aclk_state_json(void) json_object_array_add(grp, nodeinstance); } - rrd_unlock(); + rrd_rdunlock(); json_object_object_add(msg, "node-instances", grp); char *str = strdupz(json_object_to_json_string_ext(msg, JSON_C_TO_STRING_PLAIN)); diff --git a/aclk/aclk.h b/src/aclk/aclk.h index 72d1a2e11..72d1a2e11 100644 --- a/aclk/aclk.h +++ b/src/aclk/aclk.h diff --git a/aclk/aclk_alarm_api.c b/src/aclk/aclk_alarm_api.c index 664671f70..664671f70 100644 --- a/aclk/aclk_alarm_api.c +++ b/src/aclk/aclk_alarm_api.c diff --git a/aclk/aclk_alarm_api.h b/src/aclk/aclk_alarm_api.h index 4d9d9447a..4d9d9447a 100644 --- a/aclk/aclk_alarm_api.h +++ b/src/aclk/aclk_alarm_api.h diff --git a/aclk/aclk_capas.c b/src/aclk/aclk_capas.c index e8d85a2b9..00102ad4a 100644 --- a/aclk/aclk_capas.c +++ b/src/aclk/aclk_capas.c @@ -18,6 +18,7 @@ const struct capability *aclk_get_agent_capas() { .name = "http_api_v2", .version = HTTP_API_V2_VERSION, .enabled = 1 }, { .name = "health", .version = 1, .enabled = 0 }, // index 7, below { .name = "req_cancel", .version = 1, .enabled = 1 }, + { .name = "dyncfg", .version = 2, .enabled = 1 }, { .name = NULL, .version = 0, .enabled = 0 } }; agent_capabilities[2].version = ml_capable() ? 1 : 0; @@ -34,6 +35,7 @@ const struct capability *aclk_get_agent_capas() struct capability *aclk_get_node_instance_capas(RRDHOST *host) { bool functions = (host == localhost || (host->receiver && stream_has_capability(host->receiver, STREAM_CAP_FUNCTIONS))); + bool dyncfg = (host == localhost || dyncfg_available_for_rrdhost(host)); struct capability ni_caps[] = { { .name = "proto", .version = 1, .enabled = 1 }, @@ -46,6 +48,7 @@ struct capability *aclk_get_node_instance_capas(RRDHOST *host) { .name = "http_api_v2", .version = HTTP_API_V2_VERSION, .enabled = 1 }, { .name = "health", .version = 1, .enabled = host->health.health_enabled }, { .name = "req_cancel", .version = 1, .enabled = 1 }, + { .name = "dyncfg", .version = 2, .enabled = dyncfg }, { .name = NULL, .version = 0, .enabled = 0 } }; diff --git a/aclk/aclk_capas.h b/src/aclk/aclk_capas.h index c39a197b8..c39a197b8 100644 --- a/aclk/aclk_capas.h +++ b/src/aclk/aclk_capas.h diff --git a/aclk/aclk_contexts_api.c b/src/aclk/aclk_contexts_api.c index f3344935e..f3344935e 100644 --- a/aclk/aclk_contexts_api.c +++ b/src/aclk/aclk_contexts_api.c diff --git a/aclk/aclk_contexts_api.h b/src/aclk/aclk_contexts_api.h index f0b5ec77e..f0b5ec77e 100644 --- a/aclk/aclk_contexts_api.h +++ b/src/aclk/aclk_contexts_api.h diff --git a/aclk/aclk_otp.c b/src/aclk/aclk_otp.c index 207ca08cf..c9c75dd38 100644 --- a/aclk/aclk_otp.c +++ b/src/aclk/aclk_otp.c @@ -7,7 +7,7 @@ #include "daemon/common.h" -#include "mqtt_websockets/c-rbuf/include/ringbuffer.h" +#include "mqtt_websockets/c-rbuf/cringbuffer.h" static int aclk_https_request(https_req_t *request, https_req_response_t *response) { int rc; @@ -839,7 +839,7 @@ int aclk_get_env(aclk_env_t *env, const char* aclk_hostname, int aclk_port) { return 1; } - buffer_sprintf(buf, "/api/v1/env?v=%s&cap=proto,ctx&claim_id=%s", &(VERSION[1]) /* skip 'v' at beginning */, agent_id); + buffer_sprintf(buf, "/api/v1/env?v=%s&cap=proto,ctx&claim_id=%s", &(NETDATA_VERSION[1]) /* skip 'v' at beginning */, agent_id); freez(agent_id); diff --git a/aclk/aclk_otp.h b/src/aclk/aclk_otp.h index 2d660e5a4..2d660e5a4 100644 --- a/aclk/aclk_otp.h +++ b/src/aclk/aclk_otp.h diff --git a/aclk/aclk_proxy.c b/src/aclk/aclk_proxy.c index 4af46208f..8d0e2d657 100644 --- a/aclk/aclk_proxy.c +++ b/src/aclk/aclk_proxy.c @@ -15,20 +15,6 @@ struct { { .type = PROXY_TYPE_UNKNOWN, .url_str = NULL }, }; -const char *aclk_proxy_type_to_s(ACLK_PROXY_TYPE *type) -{ - switch (*type) { - case PROXY_DISABLED: - return "disabled"; - case PROXY_TYPE_HTTP: - return "HTTP"; - case PROXY_TYPE_SOCKS5: - return "SOCKS"; - default: - return "Unknown"; - } -} - static inline ACLK_PROXY_TYPE aclk_find_proxy(const char *string) { int i = 0; @@ -127,7 +113,12 @@ static inline int check_http_enviroment(const char **proxy) const char *aclk_lws_wss_get_proxy_setting(ACLK_PROXY_TYPE *type) { - const char *proxy = config_get(CONFIG_SECTION_CLOUD, ACLK_PROXY_CONFIG_VAR, ACLK_PROXY_ENV); + const char *proxy = appconfig_get(&cloud_config, CONFIG_SECTION_GLOBAL, ACLK_PROXY_CONFIG_VAR, ACLK_PROXY_ENV); + + // backward compatibility: "proxy" was in "netdata.conf" + if (config_exists(CONFIG_SECTION_CLOUD, ACLK_PROXY_CONFIG_VAR)) + proxy = config_get(CONFIG_SECTION_CLOUD, ACLK_PROXY_CONFIG_VAR, ACLK_PROXY_ENV); + *type = PROXY_DISABLED; if (strcmp(proxy, "none") == 0) diff --git a/aclk/aclk_proxy.h b/src/aclk/aclk_proxy.h index b4ceb7df8..6877b526b 100644 --- a/aclk/aclk_proxy.h +++ b/src/aclk/aclk_proxy.h @@ -13,7 +13,6 @@ typedef enum aclk_proxy_type { PROXY_NOT_SET, } ACLK_PROXY_TYPE; -const char *aclk_proxy_type_to_s(ACLK_PROXY_TYPE *type); ACLK_PROXY_TYPE aclk_verify_proxy(const char *string); const char *aclk_lws_wss_get_proxy_setting(ACLK_PROXY_TYPE *type); void safe_log_proxy_censor(char *proxy); diff --git a/aclk/aclk_query.c b/src/aclk/aclk_query.c index 5e3574b97..08bc2acf3 100644 --- a/aclk/aclk_query.c +++ b/src/aclk/aclk_query.c @@ -99,30 +99,48 @@ static int http_api_v2(struct aclk_query_thread *query_thr, aclk_query_t query) BUFFER *local_buffer = NULL; size_t size = 0; size_t sent = 0; + usec_t dt_ut = 0; int z_ret; BUFFER *z_buffer = buffer_create(NETDATA_WEB_RESPONSE_INITIAL_SIZE, &netdata_buffers_statistics.buffers_aclk); - char *start, *end; struct web_client *w = web_client_get_from_cache(); - w->acl = WEB_CLIENT_ACL_ACLK; - w->mode = WEB_CLIENT_MODE_GET; + web_client_set_conn_cloud(w); + w->port_acl = HTTP_ACL_ACLK | HTTP_ACL_ALL_FEATURES; + w->acl = w->port_acl; + web_client_set_permissions(w, HTTP_ACCESS_MAP_OLD_MEMBER, HTTP_USER_ROLE_MEMBER, WEB_CLIENT_FLAG_AUTH_CLOUD); + + w->mode = HTTP_REQUEST_MODE_GET; w->timings.tv_in = query->created_tv; w->interrupt.callback = aclk_web_client_interrupt_cb; w->interrupt.callback_data = pending_req_list_add(query->msg_id); - usec_t t; + buffer_flush(w->response.data); + buffer_strcat(w->response.data, query->data.http_api_v2.payload); + + HTTP_VALIDATION validation = http_request_validate(w); + if(validation != HTTP_VALIDATION_OK) { + nd_log(NDLS_ACCESS, NDLP_ERR, "ACLK received request is not valid, code %d", validation); + retval = 1; + w->response.code = HTTP_RESP_BAD_REQUEST; + w->response.code = (short)aclk_http_msg_v2(query_thr->client, query->callback_topic, query->msg_id, + dt_ut, query->created, w->response.code, + NULL, 0); + goto cleanup; + } + web_client_timeout_checkpoint_set(w, query->timeout); - if(web_client_timeout_checkpoint_and_check(w, &t)) { - nd_log(NDLS_ACCESS, NDLP_ERR, "QUERY CANCELED: QUEUE TIME EXCEEDED %llu ms (LIMIT %d ms)", t / USEC_PER_MS, query->timeout); + if(web_client_timeout_checkpoint_and_check(w, &dt_ut)) { + nd_log(NDLS_ACCESS, NDLP_ERR, + "QUERY CANCELED: QUEUE TIME EXCEEDED %llu ms (LIMIT %d ms)", + dt_ut / USEC_PER_MS, query->timeout); retval = 1; w->response.code = HTTP_RESP_SERVICE_UNAVAILABLE; aclk_http_msg_v2_err(query_thr->client, query->callback_topic, query->msg_id, w->response.code, CLOUD_EC_SND_TIMEOUT, CLOUD_EMSG_SND_TIMEOUT, NULL, 0); goto cleanup; } - web_client_decode_path_and_query_string(w, query->data.http_api_v2.query); char *path = (char *)buffer_tostring(w->url_path_decoded); if (aclk_stats_enabled) { @@ -134,41 +152,24 @@ static int http_api_v2(struct aclk_query_thread *query_thr, aclk_query_t query) } w->response.code = (short)web_client_api_request_with_node_selection(localhost, w, path); - web_client_timeout_checkpoint_response_ready(w, &t); + web_client_timeout_checkpoint_response_ready(w, &dt_ut); if (aclk_stats_enabled) { ACLK_STATS_LOCK; - aclk_metrics_per_sample.cloud_q_process_total += t; + aclk_metrics_per_sample.cloud_q_process_total += dt_ut; aclk_metrics_per_sample.cloud_q_process_count++; - if (aclk_metrics_per_sample.cloud_q_process_max < t) - aclk_metrics_per_sample.cloud_q_process_max = t; + if (aclk_metrics_per_sample.cloud_q_process_max < dt_ut) + aclk_metrics_per_sample.cloud_q_process_max = dt_ut; ACLK_STATS_UNLOCK; } size = w->response.data->len; sent = size; - // check if gzip encoding can and should be used - if ((start = strstr((char *)query->data.http_api_v2.payload, WEB_HDR_ACCEPT_ENC))) { - start += strlen(WEB_HDR_ACCEPT_ENC); - end = strstr(start, "\x0D\x0A"); - start = strstr(start, "gzip"); - - if (start && start < end) { - w->response.zstream.zalloc = Z_NULL; - w->response.zstream.zfree = Z_NULL; - w->response.zstream.opaque = Z_NULL; - if(deflateInit2(&w->response.zstream, web_gzip_level, Z_DEFLATED, 15 + 16, 8, web_gzip_strategy) == Z_OK) { - w->response.zinitialized = true; - w->response.zoutput = true; - } else - netdata_log_error("Failed to initialize zlib. Proceeding without compression."); - } - } - if (w->response.data->len && w->response.zinitialized) { w->response.zstream.next_in = (Bytef *)w->response.data->buffer; w->response.zstream.avail_in = w->response.data->len; + do { w->response.zstream.avail_out = NETDATA_WEB_RESPONSE_ZLIB_CHUNK_SIZE; w->response.zstream.next_out = w->response.zbuffer; @@ -188,6 +189,7 @@ static int http_api_v2(struct aclk_query_thread *query_thr, aclk_query_t query) memcpy(&z_buffer->buffer[z_buffer->len], w->response.zbuffer, bytes_to_cpy); z_buffer->len += bytes_to_cpy; } while(z_ret != Z_STREAM_END); + // so that web_client_build_http_header // puts correct content length into header buffer_free(w->response.data); @@ -213,7 +215,9 @@ static int http_api_v2(struct aclk_query_thread *query_thr, aclk_query_t query) } // send msg. - w->response.code = aclk_http_msg_v2(query_thr->client, query->callback_topic, query->msg_id, t, query->created, w->response.code, local_buffer->buffer, local_buffer->len); + w->response.code = (short)aclk_http_msg_v2(query_thr->client, query->callback_topic, query->msg_id, + dt_ut, query->created, w->response.code, + local_buffer->buffer, local_buffer->len); cleanup: web_client_log_completed_request(w, false); @@ -347,8 +351,11 @@ void aclk_query_threads_start(struct aclk_query_threads *query_threads, mqtt_wss if(unlikely(snprintfz(thread_name, TASK_LEN_MAX, "ACLK_QRY[%d]", i) < 0)) netdata_log_error("snprintf encoding error"); - netdata_thread_create( - &query_threads->thread_list[i].thread, thread_name, NETDATA_THREAD_OPTION_JOINABLE, aclk_query_main_thread, + + query_threads->thread_list[i].thread = nd_thread_create( + thread_name, + NETDATA_THREAD_OPTION_JOINABLE, + aclk_query_main_thread, &query_threads->thread_list[i]); } } @@ -357,7 +364,7 @@ void aclk_query_threads_cleanup(struct aclk_query_threads *query_threads) { if (query_threads && query_threads->thread_list) { for (int i = 0; i < query_threads->count; i++) { - netdata_thread_join(query_threads->thread_list[i].thread, NULL); + nd_thread_join(query_threads->thread_list[i].thread); } freez(query_threads->thread_list); } diff --git a/aclk/aclk_query.h b/src/aclk/aclk_query.h index dbe6f9e5e..900583237 100644 --- a/aclk/aclk_query.h +++ b/src/aclk/aclk_query.h @@ -5,7 +5,7 @@ #include "libnetdata/libnetdata.h" -#include "mqtt_wss_client.h" +#include "mqtt_websockets/mqtt_wss_client.h" #include "aclk_query_queue.h" @@ -18,7 +18,7 @@ extern pthread_mutex_t query_lock_wait; //extern volatile int aclk_connected; struct aclk_query_thread { - netdata_thread_t thread; + ND_THREAD *thread; int idx; mqtt_wss_client client; }; diff --git a/aclk/aclk_query_queue.c b/src/aclk/aclk_query_queue.c index 8ca21d456..3edadc002 100644 --- a/aclk/aclk_query_queue.c +++ b/src/aclk/aclk_query_queue.c @@ -10,11 +10,9 @@ static netdata_mutex_t aclk_query_queue_mutex = NETDATA_MUTEX_INITIALIZER; static struct aclk_query_queue { aclk_query_t head; - aclk_query_t tail; int block_push; } aclk_query_queue = { .head = NULL, - .tail = NULL, .block_push = 0 }; @@ -31,15 +29,7 @@ static inline int _aclk_queue_query(aclk_query_t query) aclk_query_free(query); return 1; } - if (!aclk_query_queue.head) { - aclk_query_queue.head = query; - aclk_query_queue.tail = query; - ACLK_QUEUE_UNLOCK; - return 0; - } - // TODO deduplication - aclk_query_queue.tail->next = query; - aclk_query_queue.tail = query; + DOUBLE_LINKED_LIST_APPEND_ITEM_UNSAFE(aclk_query_queue.head, query, prev, next); ACLK_QUEUE_UNLOCK; return 0; @@ -77,9 +67,7 @@ aclk_query_t aclk_queue_pop(void) return ret; } - aclk_query_queue.head = ret->next; - if (unlikely(!aclk_query_queue.head)) - aclk_query_queue.tail = aclk_query_queue.head; + DOUBLE_LINKED_LIST_REMOVE_ITEM_UNSAFE(aclk_query_queue.head, ret, prev, next); ACLK_QUEUE_UNLOCK; ret->next = NULL; @@ -92,7 +80,7 @@ void aclk_queue_flush(void) while (query) { aclk_query_free(query); query = aclk_queue_pop(); - }; + } } aclk_query_t aclk_query_new(aclk_query_type_t type) diff --git a/aclk/aclk_query_queue.h b/src/aclk/aclk_query_queue.h index 5983561a6..4a4a36a3f 100644 --- a/aclk/aclk_query_queue.h +++ b/src/aclk/aclk_query_queue.h @@ -55,7 +55,7 @@ struct aclk_query { struct timeval created_tv; usec_t created; int timeout; - aclk_query_t next; + aclk_query_t prev, next; // TODO maybe remove? int version; @@ -75,12 +75,13 @@ void aclk_queue_flush(void); void aclk_queue_lock(void); void aclk_queue_unlock(void); -#define QUEUE_IF_PAYLOAD_PRESENT(query) \ +#define QUEUE_IF_PAYLOAD_PRESENT(query) do { \ if (likely(query->data.bin_payload.payload)) { \ aclk_queue_query(query); \ } else { \ - netdata_log_error("Failed to generate payload (%s)", __FUNCTION__); \ + nd_log(NDLS_DAEMON, NDLP_ERR, "Failed to generate payload"); \ aclk_query_free(query); \ - } + } \ +} while(0) #endif /* NETDATA_ACLK_QUERY_QUEUE_H */ diff --git a/aclk/aclk_rrdhost_state.h b/src/aclk/aclk_rrdhost_state.h index 5c8a2ddc9..5c8a2ddc9 100644 --- a/aclk/aclk_rrdhost_state.h +++ b/src/aclk/aclk_rrdhost_state.h diff --git a/aclk/aclk_rx_msgs.c b/src/aclk/aclk_rx_msgs.c index 0e91e28c0..60e421928 100644 --- a/aclk/aclk_rx_msgs.c +++ b/src/aclk/aclk_rx_msgs.c @@ -11,7 +11,6 @@ #include "schema-wrappers/proto_2_json.h" #define ACLK_V2_PAYLOAD_SEPARATOR "\x0D\x0A\x0D\x0A" -#define ACLK_CLOUD_REQ_V2_PREFIX "GET /" #define ACLK_V_COMPRESSION 2 @@ -100,13 +99,17 @@ static inline int aclk_v2_payload_get_query(const char *payload, char **query_ur { const char *start, *end; - // TODO better check of URL - if(strncmp(payload, ACLK_CLOUD_REQ_V2_PREFIX, strlen(ACLK_CLOUD_REQ_V2_PREFIX))) { + if(strncmp(payload, "GET /", 5) == 0 || strncmp(payload, "PUT /", 5) == 0) + start = payload + 4; + else if(strncmp(payload, "POST /", 6) == 0) + start = payload + 5; + else if(strncmp(payload, "DELETE /", 8) == 0) + start = payload + 7; + else { errno = 0; - netdata_log_error("Only accepting requests that start with \"%s\" from CLOUD.", ACLK_CLOUD_REQ_V2_PREFIX); + netdata_log_error("Only accepting requests that start with GET, POST, PUT, DELETE from CLOUD."); return 1; } - start = payload + 4; if(!(end = strstr(payload, HTTP_1_1 HTTP_ENDL))) { errno = 0; @@ -196,7 +199,7 @@ int aclk_handle_cloud_cmd_message(char *payload) // Originally we were expecting to have multiple types of 'cmd' message, // but after the new protocol was designed we will ever only have 'http' - if (strcmp(cloud_to_agent.type_id, "http")) { + if (strcmp(cloud_to_agent.type_id, "http") != 0) { error_report("Only 'http' cmd message is supported"); goto err_cleanup; } @@ -252,7 +255,7 @@ int create_node_instance_result(const char *msg, size_t msg_len) netdata_log_debug(D_ACLK, "CreateNodeInstanceResult: guid:%s nodeid:%s", res.machine_guid, res.node_id); - uuid_t host_id, node_id; + nd_uuid_t host_id, node_id; if (uuid_parse(res.machine_guid, host_id)) { netdata_log_error("Error parsing machine_guid provided by CreateNodeInstanceResult"); freez(res.machine_guid); diff --git a/aclk/aclk_rx_msgs.h b/src/aclk/aclk_rx_msgs.h index 61921faec..61921faec 100644 --- a/aclk/aclk_rx_msgs.h +++ b/src/aclk/aclk_rx_msgs.h diff --git a/aclk/aclk_stats.c b/src/aclk/aclk_stats.c index f4672882b..47a48c366 100644 --- a/aclk/aclk_stats.c +++ b/src/aclk/aclk_stats.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later +#ifndef MQTT_WSS_CPUSTATS #define MQTT_WSS_CPUSTATS +#endif #include "aclk_stats.h" @@ -385,11 +387,12 @@ void *aclk_stats_main_thread(void *ptr) struct aclk_metrics permanent; while (service_running(SERVICE_ACLK | SERVICE_COLLECTORS)) { - netdata_thread_testcancel(); + // ------------------------------------------------------------------------ // Wait for the next iteration point. heartbeat_next(&hb, step_ut); + if (!service_running(SERVICE_ACLK | SERVICE_COLLECTORS)) break; ACLK_STATS_LOCK; diff --git a/aclk/aclk_stats.h b/src/aclk/aclk_stats.h index 002ebcfa6..e13269557 100644 --- a/aclk/aclk_stats.h +++ b/src/aclk/aclk_stats.h @@ -6,7 +6,7 @@ #include "daemon/common.h" #include "libnetdata/libnetdata.h" #include "aclk_query_queue.h" -#include "mqtt_wss_client.h" +#include "mqtt_websockets/mqtt_wss_client.h" extern netdata_mutex_t aclk_stats_mutex; @@ -19,7 +19,7 @@ extern netdata_mutex_t aclk_stats_mutex; int aclk_cloud_req_http_type_to_idx(const char *name); struct aclk_stats_thread { - netdata_thread_t *thread; + ND_THREAD *thread; int query_thread_count; mqtt_wss_client client; }; diff --git a/aclk/aclk_tx_msgs.c b/src/aclk/aclk_tx_msgs.c index 0e4182a72..c1ed68052 100644 --- a/aclk/aclk_tx_msgs.c +++ b/src/aclk/aclk_tx_msgs.c @@ -101,7 +101,7 @@ static int aclk_send_message_with_bin_payload(mqtt_wss_client client, json_objec */ static struct json_object *create_hdr(const char *type, const char *msg_id, time_t ts_secs, usec_t ts_us, int version) { - uuid_t uuid; + nd_uuid_t uuid; char uuid_str[36 + 1]; json_object *tmp; json_object *obj = json_object_new_object(); diff --git a/aclk/aclk_tx_msgs.h b/src/aclk/aclk_tx_msgs.h index 9e7d89077..86ed20c38 100644 --- a/aclk/aclk_tx_msgs.h +++ b/src/aclk/aclk_tx_msgs.h @@ -5,7 +5,7 @@ #include <json-c/json.h> #include "libnetdata/libnetdata.h" #include "daemon/common.h" -#include "mqtt_wss_client.h" +#include "mqtt_websockets/mqtt_wss_client.h" #include "schema-wrappers/schema_wrappers.h" #include "aclk_util.h" diff --git a/aclk/aclk_util.c b/src/aclk/aclk_util.c index 3bf2e3f18..3bf2e3f18 100644 --- a/aclk/aclk_util.c +++ b/src/aclk/aclk_util.c diff --git a/aclk/aclk_util.h b/src/aclk/aclk_util.h index 38ef5b0bc..6c0239cc3 100644 --- a/aclk/aclk_util.h +++ b/src/aclk/aclk_util.h @@ -5,7 +5,7 @@ #include "libnetdata/libnetdata.h" #ifdef ENABLE_ACLK -#include "mqtt_wss_client.h" +#include "mqtt_websockets/mqtt_wss_client.h" #define CLOUD_EC_MALFORMED_NODE_ID 1 #define CLOUD_EMSG_MALFORMED_NODE_ID "URL requests node_id but there is not enough chars following (for it to be valid uuid)." diff --git a/aclk/helpers/mqtt_wss_pal.h b/src/aclk/helpers/mqtt_wss_pal.h index 5c89f8bb7..5c89f8bb7 100644 --- a/aclk/helpers/mqtt_wss_pal.h +++ b/src/aclk/helpers/mqtt_wss_pal.h diff --git a/aclk/helpers/ringbuffer_pal.h b/src/aclk/helpers/ringbuffer_pal.h index 2f7e1cb93..2f7e1cb93 100644 --- a/aclk/helpers/ringbuffer_pal.h +++ b/src/aclk/helpers/ringbuffer_pal.h diff --git a/aclk/https_client.c b/src/aclk/https_client.c index 5385786b8..2bc768f24 100644 --- a/aclk/https_client.c +++ b/src/aclk/https_client.c @@ -8,8 +8,6 @@ #include "daemon/global_statistics.h" -#define DEFAULT_CHUNKED_RESPONSE_BUFFER_SIZE (4096) - static const char *http_req_type_to_str(http_req_type_t req) { switch (req) { case HTTP_REQ_GET: @@ -25,10 +23,9 @@ static const char *http_req_type_to_str(http_req_type_t req) { #define TRANSFER_ENCODING_CHUNKED (-2) -#define HTTP_PARSE_CTX_INITIALIZER { .state = HTTP_PARSE_INITIAL, .content_length = -1, .http_code = 0 } -void http_parse_ctx_create(http_parse_ctx *ctx) +void http_parse_ctx_create(http_parse_ctx *ctx, enum http_parse_state parse_state) { - ctx->state = HTTP_PARSE_INITIAL; + ctx->state = parse_state; ctx->content_length = -1; ctx->http_code = 0; ctx->headers = c_rhash_new(0); @@ -54,6 +51,7 @@ void http_parse_ctx_destroy(http_parse_ctx *ctx) #define HTTP_LINE_TERM "\x0D\x0A" #define RESP_PROTO "HTTP/1.1 " +#define RESP_PROTO10 "HTTP/1.0 " #define HTTP_KEYVAL_SEPARATOR ": " #define HTTP_HDR_BUFFER_SIZE 1024 #define PORT_STR_MAX_BYTES 12 @@ -247,10 +245,20 @@ http_parse_rc parse_http_response(rbuf_t buf, http_parse_ctx *parse_ctx) if (parse_ctx->state != HTTP_PARSE_CONTENT && !rbuf_find_bytes(buf, HTTP_LINE_TERM, strlen(HTTP_LINE_TERM), &idx)) return HTTP_PARSE_NEED_MORE_DATA; switch (parse_ctx->state) { + case HTTP_PARSE_PROXY_CONNECT: case HTTP_PARSE_INITIAL: if (rbuf_memcmp_n(buf, RESP_PROTO, strlen(RESP_PROTO))) { - netdata_log_error("Expected response to start with \"%s\"", RESP_PROTO); - return HTTP_PARSE_ERROR; + if (parse_ctx->state == HTTP_PARSE_PROXY_CONNECT) { + if (rbuf_memcmp_n(buf, RESP_PROTO10, strlen(RESP_PROTO10))) { + netdata_log_error( + "Expected response to start with \"%s\" or \"%s\"", RESP_PROTO, RESP_PROTO10); + return HTTP_PARSE_ERROR; + } + } + else { + netdata_log_error("Expected response to start with \"%s\"", RESP_PROTO); + return HTTP_PARSE_ERROR; + } } rbuf_bump_tail(buf, strlen(RESP_PROTO)); if (rbuf_pop(buf, rc, 4) != 4) { @@ -316,8 +324,6 @@ typedef struct https_req_ctx { size_t written; - int self_signed_allowed; - http_parse_ctx parse_ctx; time_t req_start_time; @@ -494,47 +500,45 @@ static int read_parse_response(https_req_ctx_t *ctx) { return 0; } +static const char *http_methods[] = { + [HTTP_REQ_GET] = "GET ", + [HTTP_REQ_POST] = "POST ", + [HTTP_REQ_CONNECT] = "CONNECT ", +}; + + #define TX_BUFFER_SIZE 8192 #define RX_BUFFER_SIZE (TX_BUFFER_SIZE*2) static int handle_http_request(https_req_ctx_t *ctx) { BUFFER *hdr = buffer_create(TX_BUFFER_SIZE, &netdata_buffers_statistics.buffers_aclk); int rc = 0; - http_parse_ctx_create(&ctx->parse_ctx); + http_req_type_t req_type = ctx->request->request_type; - // Prepare data to send - switch (ctx->request->request_type) { - case HTTP_REQ_CONNECT: - buffer_strcat(hdr, "CONNECT "); - break; - case HTTP_REQ_GET: - buffer_strcat(hdr, "GET "); - break; - case HTTP_REQ_POST: - buffer_strcat(hdr, "POST "); - break; - default: - netdata_log_error("Unknown HTTPS request type!"); - rc = 1; - goto err_exit; + if (req_type >= HTTP_REQ_INVALID) { + netdata_log_error("Unknown HTTPS request type!"); + rc = 1; + goto err_exit; } + buffer_strcat(hdr, http_methods[req_type]); - if (ctx->request->request_type == HTTP_REQ_CONNECT) { + if (req_type == HTTP_REQ_CONNECT) { buffer_strcat(hdr, ctx->request->host); buffer_sprintf(hdr, ":%d", ctx->request->port); - } else { + http_parse_ctx_create(&ctx->parse_ctx, HTTP_PARSE_PROXY_CONNECT); + } + else { buffer_strcat(hdr, ctx->request->url); + http_parse_ctx_create(&ctx->parse_ctx, HTTP_PARSE_INITIAL); } buffer_strcat(hdr, HTTP_1_1 HTTP_ENDL); //TODO Headers! - if (ctx->request->request_type != HTTP_REQ_CONNECT) { - buffer_sprintf(hdr, "Host: %s\x0D\x0A", ctx->request->host); - } + buffer_sprintf(hdr, "Host: %s\x0D\x0A", ctx->request->host); buffer_strcat(hdr, "User-Agent: Netdata/rocks newhttpclient\x0D\x0A"); - if (ctx->request->request_type == HTTP_REQ_POST && ctx->request->payload && ctx->request->payload_size) { + if (req_type == HTTP_REQ_POST && ctx->request->payload && ctx->request->payload_size) { buffer_sprintf(hdr, "Content-Length: %zu\x0D\x0A", ctx->request->payload_size); } if (ctx->request->proxy_username) { @@ -565,7 +569,7 @@ static int handle_http_request(https_req_ctx_t *ctx) { goto err_exit; } - if (ctx->request->request_type == HTTP_REQ_POST && ctx->request->payload && ctx->request->payload_size) { + if (req_type == HTTP_REQ_POST && ctx->request->payload && ctx->request->payload_size) { if (https_client_write_all(ctx, ctx->request->payload, ctx->request->payload_size)) { netdata_log_error("Couldn't write payload into SSL connection"); rc = 3; @@ -762,12 +766,6 @@ void https_req_response_free(https_req_response_t *res) { freez(res->payload); } -void https_req_response_init(https_req_response_t *res) { - res->http_code = 0; - res->payload = NULL; - res->payload_size = 0; -} - static inline char *UNUSED_FUNCTION(min_non_null)(char *a, char *b) { if (!a) return b; @@ -816,12 +814,11 @@ static inline void port_by_proto(url_t *url) { } } -#define STRDUPZ_2PTR(dest, start, end) \ - { \ +#define STRDUPZ_2PTR(dest, start, end) do { \ dest = mallocz(1 + end - start); \ memcpy(dest, start, end - start); \ dest[end - start] = 0; \ - } + } while(0) int url_parse(const char *url, url_t *parsed) { const char *start = url; @@ -833,7 +830,7 @@ int url_parse(const char *url, url_t *parsed) { return 1; } - STRDUPZ_2PTR(parsed->proto, start, end) + STRDUPZ_2PTR(parsed->proto, start, end); start = end + strlen(URI_PROTO_SEPARATOR); } diff --git a/aclk/https_client.h b/src/aclk/https_client.h index 0b97fbb02..bc5ca30b8 100644 --- a/aclk/https_client.h +++ b/src/aclk/https_client.h @@ -5,13 +5,14 @@ #include "libnetdata/libnetdata.h" -#include "mqtt_websockets/c-rbuf/include/ringbuffer.h" -#include "mqtt_websockets/c_rhash/include/c_rhash.h" +#include "mqtt_websockets/c-rbuf/cringbuffer.h" +#include "mqtt_websockets/c_rhash/c_rhash.h" typedef enum http_req_type { HTTP_REQ_GET = 0, HTTP_REQ_POST, - HTTP_REQ_CONNECT + HTTP_REQ_CONNECT, + HTTP_REQ_INVALID } http_req_type_t; typedef struct { @@ -56,7 +57,6 @@ int url_parse(const char *url, url_t *parsed); void url_t_destroy(url_t *url); void https_req_response_free(https_req_response_t *res); -void https_req_response_init(https_req_response_t *res); #define HTTPS_REQ_RESPONSE_T_INITIALIZER \ { \ @@ -83,7 +83,8 @@ int https_request(https_req_t *request, https_req_response_t *response); // we expose previously internal parser as this is usefull also from // other parts of the code enum http_parse_state { - HTTP_PARSE_INITIAL = 0, + HTTP_PARSE_PROXY_CONNECT = 0, + HTTP_PARSE_INITIAL, HTTP_PARSE_HEADERS, HTTP_PARSE_CONTENT }; @@ -119,7 +120,7 @@ typedef struct { size_t chunk_got; } http_parse_ctx; -void http_parse_ctx_create(http_parse_ctx *ctx); +void http_parse_ctx_create(http_parse_ctx *ctx, enum http_parse_state parse_state); void http_parse_ctx_destroy(http_parse_ctx *ctx); typedef enum { diff --git a/aclk/schema-wrappers/agent_cmds.cc b/src/aclk/schema-wrappers/agent_cmds.cc index 6950f4025..6950f4025 100644 --- a/aclk/schema-wrappers/agent_cmds.cc +++ b/src/aclk/schema-wrappers/agent_cmds.cc diff --git a/aclk/schema-wrappers/agent_cmds.h b/src/aclk/schema-wrappers/agent_cmds.h index 7e01f86c5..7e01f86c5 100644 --- a/aclk/schema-wrappers/agent_cmds.h +++ b/src/aclk/schema-wrappers/agent_cmds.h diff --git a/aclk/schema-wrappers/alarm_config.cc b/src/aclk/schema-wrappers/alarm_config.cc index 64d28f324..64d28f324 100644 --- a/aclk/schema-wrappers/alarm_config.cc +++ b/src/aclk/schema-wrappers/alarm_config.cc diff --git a/aclk/schema-wrappers/alarm_config.h b/src/aclk/schema-wrappers/alarm_config.h index 3c9a5d9a8..3c9a5d9a8 100644 --- a/aclk/schema-wrappers/alarm_config.h +++ b/src/aclk/schema-wrappers/alarm_config.h diff --git a/aclk/schema-wrappers/alarm_stream.cc b/src/aclk/schema-wrappers/alarm_stream.cc index 29d80e39e..29d80e39e 100644 --- a/aclk/schema-wrappers/alarm_stream.cc +++ b/src/aclk/schema-wrappers/alarm_stream.cc diff --git a/aclk/schema-wrappers/alarm_stream.h b/src/aclk/schema-wrappers/alarm_stream.h index 3c81ff445..3c81ff445 100644 --- a/aclk/schema-wrappers/alarm_stream.h +++ b/src/aclk/schema-wrappers/alarm_stream.h diff --git a/aclk/schema-wrappers/capability.cc b/src/aclk/schema-wrappers/capability.cc index af45740a9..af45740a9 100644 --- a/aclk/schema-wrappers/capability.cc +++ b/src/aclk/schema-wrappers/capability.cc diff --git a/aclk/schema-wrappers/capability.h b/src/aclk/schema-wrappers/capability.h index c6085a44b..c6085a44b 100644 --- a/aclk/schema-wrappers/capability.h +++ b/src/aclk/schema-wrappers/capability.h diff --git a/aclk/schema-wrappers/connection.cc b/src/aclk/schema-wrappers/connection.cc index 20b40ece2..20b40ece2 100644 --- a/aclk/schema-wrappers/connection.cc +++ b/src/aclk/schema-wrappers/connection.cc diff --git a/aclk/schema-wrappers/connection.h b/src/aclk/schema-wrappers/connection.h index 0356c7d78..0356c7d78 100644 --- a/aclk/schema-wrappers/connection.h +++ b/src/aclk/schema-wrappers/connection.h diff --git a/aclk/schema-wrappers/context.cc b/src/aclk/schema-wrappers/context.cc index b04c9d20c..b04c9d20c 100644 --- a/aclk/schema-wrappers/context.cc +++ b/src/aclk/schema-wrappers/context.cc diff --git a/aclk/schema-wrappers/context.h b/src/aclk/schema-wrappers/context.h index cbb7701a8..cbb7701a8 100644 --- a/aclk/schema-wrappers/context.h +++ b/src/aclk/schema-wrappers/context.h diff --git a/aclk/schema-wrappers/context_stream.cc b/src/aclk/schema-wrappers/context_stream.cc index 3bb1956cb..3bb1956cb 100644 --- a/aclk/schema-wrappers/context_stream.cc +++ b/src/aclk/schema-wrappers/context_stream.cc diff --git a/aclk/schema-wrappers/context_stream.h b/src/aclk/schema-wrappers/context_stream.h index 8c691d2cc..8c691d2cc 100644 --- a/aclk/schema-wrappers/context_stream.h +++ b/src/aclk/schema-wrappers/context_stream.h diff --git a/aclk/schema-wrappers/node_connection.cc b/src/aclk/schema-wrappers/node_connection.cc index db1fa6449..db1fa6449 100644 --- a/aclk/schema-wrappers/node_connection.cc +++ b/src/aclk/schema-wrappers/node_connection.cc diff --git a/aclk/schema-wrappers/node_connection.h b/src/aclk/schema-wrappers/node_connection.h index dac0d8fe0..dac0d8fe0 100644 --- a/aclk/schema-wrappers/node_connection.h +++ b/src/aclk/schema-wrappers/node_connection.h diff --git a/aclk/schema-wrappers/node_creation.cc b/src/aclk/schema-wrappers/node_creation.cc index 5ad25b7e5..5ad25b7e5 100644 --- a/aclk/schema-wrappers/node_creation.cc +++ b/src/aclk/schema-wrappers/node_creation.cc diff --git a/aclk/schema-wrappers/node_creation.h b/src/aclk/schema-wrappers/node_creation.h index 7a8c7f7c7..7a8c7f7c7 100644 --- a/aclk/schema-wrappers/node_creation.h +++ b/src/aclk/schema-wrappers/node_creation.h diff --git a/aclk/schema-wrappers/node_info.cc b/src/aclk/schema-wrappers/node_info.cc index 5e321f688..5e321f688 100644 --- a/aclk/schema-wrappers/node_info.cc +++ b/src/aclk/schema-wrappers/node_info.cc diff --git a/aclk/schema-wrappers/node_info.h b/src/aclk/schema-wrappers/node_info.h index 4f57601df..4f57601df 100644 --- a/aclk/schema-wrappers/node_info.h +++ b/src/aclk/schema-wrappers/node_info.h diff --git a/aclk/schema-wrappers/proto_2_json.cc b/src/aclk/schema-wrappers/proto_2_json.cc index 854396510..854396510 100644 --- a/aclk/schema-wrappers/proto_2_json.cc +++ b/src/aclk/schema-wrappers/proto_2_json.cc diff --git a/aclk/schema-wrappers/proto_2_json.h b/src/aclk/schema-wrappers/proto_2_json.h index 3bd98478c..3bd98478c 100644 --- a/aclk/schema-wrappers/proto_2_json.h +++ b/src/aclk/schema-wrappers/proto_2_json.h diff --git a/aclk/schema-wrappers/schema_wrapper_utils.cc b/src/aclk/schema-wrappers/schema_wrapper_utils.cc index 96a4b9bf1..96a4b9bf1 100644 --- a/aclk/schema-wrappers/schema_wrapper_utils.cc +++ b/src/aclk/schema-wrappers/schema_wrapper_utils.cc diff --git a/aclk/schema-wrappers/schema_wrappers.h b/src/aclk/schema-wrappers/schema_wrappers.h index b651b8845..b651b8845 100644 --- a/aclk/schema-wrappers/schema_wrappers.h +++ b/src/aclk/schema-wrappers/schema_wrappers.h |