diff --git a/luci-app-netdata/.img/config.png b/luci-app-netdata/.img/config.png
deleted file mode 100644
index debe4d5c..00000000
Binary files a/luci-app-netdata/.img/config.png and /dev/null differ
diff --git a/luci-app-netdata/.img/netdata.png b/luci-app-netdata/.img/netdata.png
deleted file mode 100644
index 3a4be2f3..00000000
Binary files a/luci-app-netdata/.img/netdata.png and /dev/null differ
diff --git a/luci-app-netdata/LICENSE b/luci-app-netdata/LICENSE
deleted file mode 100644
index f288702d..00000000
--- a/luci-app-netdata/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- 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.
-
-
- Copyright (C)
-
- 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 .
-
-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:
-
- Copyright (C)
- 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
-.
-
- 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
-.
diff --git a/luci-app-netdata/Makefile b/luci-app-netdata/Makefile
index e069c485..7727ee72 100644
--- a/luci-app-netdata/Makefile
+++ b/luci-app-netdata/Makefile
@@ -1,28 +1,18 @@
# SPDX-License-Identifier: GPL-3.0
#
-# Copyright (C) 2022-2025 muink
+# Copyright (C) 2021-2025 sirpdboy https://github.com/sirpdboy/luci-app-netdata
include $(TOPDIR)/rules.mk
-LUCI_NAME:=luci-app-netdata
-LUCI_TITLE:=LuCI Netdata
-LUCI_DEPENDS:=+netdata-ssl +openssl-util
+LUCI_TITLE:=LuCI app for netdata
+LUCI_DEPENDS:=+netdata
-LUCI_DESCRIPTION:=Real-time performance monitoring
-
-PKG_MAINTAINER:=Anya Lin
+PKG_NAME:=luci-app-netdata
+PKG_VERSION:=2.0.4
+PKG_RELEASE:=4
PKG_LICENSE:=GPL-3.0
-define Package/$(LUCI_NAME)/conffiles
-endef
-
-define Package/$(LUCI_NAME)/postinst
-endef
-
-define Package/$(LUCI_NAME)/prerm
-endef
-
include $(TOPDIR)/feeds/luci/luci.mk
# call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-app-netdata/README.md b/luci-app-netdata/README.md
deleted file mode 100644
index 8f6f5582..00000000
--- a/luci-app-netdata/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# LuCI Netdata
-> [Netdata][] is high-fidelity infrastructure monitoring and troubleshooting.
-Open-source, free, preconfigured, opinionated, and always real-time.
-
-### Screenshots
-
-
-
-
-### How to install
-
-1. Goto ~~[releases](https://github.com/muink/luci-app-netdata/tree/releases)~~ [here](https://fantastic-packages.github.io/packages/)
-2. Download the latest version of ipk
-3. Login router and goto **System --> Software**
-4. Upload and install ipk
-5. Reboot if the app is not automatically added in page
-6. Goto **Status --> Netdata**
-7. If after program update. LuCI is not working properly, please reinstall luci-app-netdata.
-8. After you upgrade Netdata, you need to reinstall netdata and luci-app-netdata.
-
-### Build
-
-- Compile from OpenWrt/LEDE SDK
-
-```
-# Take the x86_64 platform as an example
-tar xjf openwrt-sdk-21.02.3-x86-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz
-# Go to the SDK root dir
-cd OpenWrt-sdk-*-x86_64_*
-# First run to generate a .config file
-make menuconfig
-./scripts/feeds update -a
-./scripts/feeds install -a
-# Get Makefile
-git clone --depth 1 --branch master --single-branch --no-checkout https://github.com/muink/luci-app-netdata.git package/luci-app-netdata
-pushd package/luci-app-netdata
-umask 022
-git checkout
-popd
-# Select the package LuCI -> Applications -> luci-app-netdata
-make menuconfig
-# Start compiling
-make package/luci-app-netdata/compile V=99
-```
-
-[Netdata]: https://github.com/netdata/netdata
-
-### License
-
-- This project is licensed under the [GPL-3.0](https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/luci-app-netdata/htdocs/luci-static/resources/view/netdata/advanced.js b/luci-app-netdata/htdocs/luci-static/resources/view/netdata/advanced.js
deleted file mode 100644
index 500a231e..00000000
--- a/luci-app-netdata/htdocs/luci-static/resources/view/netdata/advanced.js
+++ /dev/null
@@ -1,35 +0,0 @@
-'use strict';
-'require view';
-'require fs';
-'require ui';
-
-const isReadonlyView = !L.hasViewPermission() || null;
-
-return view.extend({
-handleSaveApply: null,
-handleReset: null,
-
- load() {
- return L.resolveDefault(fs.read('/etc/netdata/netdata.conf'), '');
- },
-
- handleSave(ev) {
- let value = (document.querySelector('textarea').value || '').trim().replace(/\r\n/g, '\n') + '\n';
-
- return fs.write('/etc/netdata/netdata.conf', value).then((rc) => {
- document.querySelector('textarea').value = value;
- ui.addNotification(null, E('p', _('Contents have been saved.')), 'info');
-
- return fs.exec('/etc/init.d/netdata', [ 'reload' ]);
- }).catch((e) => {
- ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
- });
- },
-
- render(conf) {
- return E([
- E('h4', _('Edit Netdata main config: /etc/netdata/netdata.conf')),
- E('p', {}, E('textarea', { 'style': 'width:100%', 'rows': 25, 'disabled': isReadonlyView }, [ conf != null ? conf : '' ]))
- ]);
- }
-});
diff --git a/luci-app-netdata/htdocs/luci-static/resources/view/netdata/basic.js b/luci-app-netdata/htdocs/luci-static/resources/view/netdata/basic.js
new file mode 100644
index 00000000..f0b65728
--- /dev/null
+++ b/luci-app-netdata/htdocs/luci-static/resources/view/netdata/basic.js
@@ -0,0 +1,183 @@
+// Copyright (C) 2021-2025 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/luci-app-netdata
+'use strict';
+'require form';
+'require poll';
+'require rpc';
+'require uci';
+'require ui';
+'require view';
+'require fs';
+const getNetdataVersion = rpc.declare({
+ object: 'luci.netdata',
+ method: 'get_version',
+ expect: { 'version': '' }
+});
+async function checkProcess() {
+ try {
+ const pidofRes = await fs.exec('/bin/pidof', ['netdata']);
+ if (pidofRes.code === 0) {
+ return {
+ running: true,
+ pid: pidofRes.stdout.trim()
+ };
+ }
+ } catch (err) {
+ // Ignore error
+ }
+ try {
+ const psRes = await fs.exec('/bin/ps', ['-C', 'netdata', '-o', 'pid=']);
+ const pid = psRes.stdout.trim();
+ return {
+ running: pid !== '',
+ pid: pid || null
+ };
+ } catch (err) {
+ return { running: false, pid: null };
+ }
+}
+function getVersionInfo() {
+ return L.resolveDefault(getNetdataVersion(), {}).then(function(result) {
+ return result || {};
+ }).catch(function(error) {
+ console.error('Failed to get version:', error);
+ return {};
+ });
+}
+
+function getServiceStatus() {
+ return L.resolveDefault(checkProcess(), {}).then(function(res) {
+ let isRunning = false;
+ try {
+ if (res && res.running) {
+ isRunning = true;
+ }
+ } catch (e) {
+ console.error('Service status error:', e);
+ }
+ return isRunning;
+ }).catch(function(error) {
+ console.error('Service status check failed:', error);
+ return false;
+ });
+}
+
+function renderStatus(isRunning, webport, protocol, version) {
+ let statusText = isRunning ? _('RUNNING') : _('NOT RUNNING');
+ let color = isRunning ? 'green' : 'red';
+ let icon = isRunning ? '✓' : '✗';
+ let versionText = version ? `${version}` : '';
+ let html = String.format(
+ '%s %s %s - %s',
+ color, icon, _('Netdata'),versionText, statusText
+ );
+
+ if (isRunning) {
+ let buttonUrl = String.format('%s//%s:%s/', protocol, window.location.hostname, webport);
+
+ html += String.format(
+ '',
+ _('Open Web UI'),
+ buttonUrl
+ );
+ }
+
+ return html;
+}
+return view.extend({
+ load: function() {
+ return Promise.all([
+ uci.load('netdata')
+ ]);
+ },
+
+ render: function(data) {
+ let m, s, o;
+ let webport = uci.get_first('netdata', 'netdata', 'port') || '19999';
+ let uci_ssl = uci.get_first('netdata', 'netdata', 'enable_ssl') || '0';
+ let protocol = uci_ssl === '1' ? 'https:' : 'http:';
+
+ m = new form.Map('netdata', _('Netdata'),
+ _('An open-source real-time performance monitoring and visualization tool'));
+
+ // 状态显示部分
+ s = m.section(form.TypedSection);
+ s.anonymous = true;
+ s.addremove = false;
+
+ s.render = function() {
+ poll.add(function() {
+ return Promise.all([
+ getServiceStatus(),
+ getVersionInfo()
+ ]).then(function(results) {
+ var [isRunning, version] = results;
+ var view = document.getElementById('service_status');
+ if (view) {
+ view.innerHTML = renderStatus(isRunning, webport, protocol, version);
+ }
+ }).catch(function(error) {
+ console.error('Poll error:', error);
+ });
+ }, 5); // 添加轮询间隔5秒
+
+ return E('div', { class: 'cbi-section', id: 'status_bar' }, [
+ E('div', { id: 'service_status' },
+ E('p', {}, _('Collecting data...'))
+ ),
+ E('div', { 'style': 'text-align: right; font-style: italic;' }, [
+ E('span', {}, [
+ _('© github '),
+ E('a', {
+ 'href': 'https://github.com/sirpdboy',
+ 'target': '_blank',
+ 'style': 'text-decoration: none;'
+ }, 'by sirpdboy')
+ ])
+ ])
+ ]);
+ };
+
+ // 配置部分
+ s = m.section(form.NamedSection, 'netdata', 'netdata');
+
+ o = s.option(form.Flag, 'enabled', _('Enable'));
+ o.default = o.disabled;
+ o.rmempty = false;
+
+ o = s.option(form.Value, 'port', _('Service port'));
+ o.datatype = 'port';
+ o.placeholder = '19999';
+ o.rmempty = false;
+ o.validate = function(section_id, value) {
+ if (value < 1 || value > 65535) {
+ return _('Port must be between 1 and 65535');
+ }
+ return true;
+ };
+
+ o = s.option(form.Flag, 'enable_ssl', _('Enable SSL'));
+ o.rmempty = true;
+
+ o = s.option(form.DummyValue, 'cert_file', _('Cert file'));
+ o.default = '/etc/ssl/ezopwrt.crt';
+ o.depends('enable_ssl', '1');
+ o.cfgvalue = function(section_id) {
+ return uci.get('netdata', section_id, 'cert_file') || '/etc/ssl/ezopwrt.crt';
+ };
+
+ o = s.option(form.DummyValue, 'key_file', _('Cert Key file'));
+ o.default = '/etc/ssl/ezopwrt.key';
+ o.depends('enable_ssl', '1');
+ o.cfgvalue = function(section_id) {
+ return uci.get('netdata', section_id, 'key_file') || '/etc/ssl/ezopwrt.key';
+ };
+
+ // o = s.option(form.DummyValue, 'feedback_info', _('feedback info'));
+ // o.href = 'https://github.com/sirpdboy';
+ // o.cfgvalue = function() {
+ // return 'https://github.com/sirpdboy';
+ // };
+
+ return m.render();
+ }
+});
\ No newline at end of file
diff --git a/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js b/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js
index 855620c5..aa4fcd1d 100644
--- a/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js
+++ b/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js
@@ -1,162 +1,36 @@
+// Copyright (C) 2021-2025 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/luci-app-netdata
'use strict';
'require view';
'require fs';
-'require uci';
'require ui';
-'require form';
+
+const isReadonlyView = !L.hasViewPermission() || null;
return view.extend({
-// handleSaveApply: null,
-// handleSave: null,
-// handleReset: null,
+handleSaveApply: null,
+handleReset: null,
load() {
- return Promise.all([
- L.resolveDefault(fs.stat('/usr/sbin/nginx'), {}),
- uci.load('netdata')
- ]);
+ return L.resolveDefault(fs.read('/etc/netdata/netdata.conf'), '');
},
- render(res) {
- const has_nginx = res[0].path;
+ handleSave(ev) {
+ let value = (document.querySelector('textarea').value || '').trim().replace(/\r\n/g, '\n') + '\n';
- let m, s, o;
+ return fs.write('/etc/netdata/netdata.conf', value).then((rc) => {
+ document.querySelector('textarea').value = value;
+ ui.addNotification(null, E('p', _('Contents have been saved.')), 'info');
- m = new form.Map('netdata');
+ return fs.exec('/etc/init.d/netdata', [ 'restart' ]);
+ }).catch((e) => {
+ ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
+ });
+ },
- s = m.section(form.TypedSection, 'netdata');
- s.anonymous = true;
-
- o = s.option(form.Flag, 'enabled', _('Enable'));
- o.rmempty = false;
-
- o = s.option(form.Value, 'port', _('Service port'));
- o.datatype = 'port';
- o.placeholder = '19999';
- o.rmempty = false;
-
- o = s.option(form.Flag, 'enable_ssl', _('Enable SSL'));
- o.rmempty = true;
- o.depends('nginx_support', '0');
-
- o = s.option(form.Value, 'cert_file', _('Cert file'));
- o.placeholder = '/etc/netdata/cert.crt';
- o.rmempty = false;
- o.retain = true;
- o.depends('enable_ssl', '1');
-
- o = s.option(form.Value, 'key_file', _('Cert Key file'));
- o.placeholder = '/etc/netdata/cert.key';
- o.rmempty = false;
- o.retain = true;
- o.depends('enable_ssl', '1');
-
- o = s.option(form.Flag, 'nginx_support', _('Nginx Support'));
- o.rmempty = true;
- if (! has_nginx) {
- o.description = _('To enable this feature you need install luci-nginx and luci-ssl-nginx
first');
- o.readonly = true;
- }
-
- o.write = function(section, value) {
- uci.set('netdata', section, 'nginx_support', has_nginx ? value : null);
- };
-
- o = s.option(form.Flag, 'auth', _('Enable Auth'));
- o.rmempty = true;
- o.depends('nginx_support', '1');
-
- o.write = function(section, value) {
- uci.set('netdata', section, 'auth', has_nginx ? value : null);
- };
-
- o = s.option(form.Value, 'user_passwd', _('Login Username and Password hash'));
- o.placeholder = 'admin:$apr1$t7qQjoqb$YBHtAb7VGSkjIdObMG.Oy0';
- o.rmempty = false;
- o.retain = true;
- o.depends('auth', '1');
-
- o = s.option(form.Button, '_webui', _('Open Web UI'));
- o.inputtitle = _('Open');
- o.inputstyle = 'apply';
- o.onclick = L.bind(function(ev, section_id) {
- const port=uci.get('netdata', section_id, 'port') || '19999';
- const ssl=uci.get('netdata', section_id, 'enable_ssl') || '0';
- const nginx=uci.get('netdata', section_id, 'nginx_support') || '0';
-
- window.open((nginx === '1' ? window.location.protocol : ssl === '1' ? 'https:' : 'http:') + '//' + window.location.hostname + (nginx === '1' ? '/netdata/' : ':' + port));
- }, o)
-
- o = s.option(form.Button, '_start', _('Start') + ' ' + _('Netdata'));
- o.inputtitle = _('Start');
- o.inputstyle = 'apply';
- o.onclick = function() {
- return fs.exec('/etc/init.d/netdata', ['start'])
- .catch((e) => { ui.addNotification(null, E('p', e.message), 'error') });
- };
-
- o = s.option(form.Button, '_stop', _('Stop') + ' ' + _('Netdata'));
- o.inputtitle = _('Stop');
- o.inputstyle = 'reset';
- o.onclick = function() {
- return fs.exec('/etc/init.d/netdata', ['stop'])
- .catch((e) => { ui.addNotification(null, E('p', e.message), 'error') });
- };
-
- s = m.section(form.TypedSection, '_utilities');
- s.render = L.bind(function(view, section_id) {
- return E('div',{ 'class': 'cbi-section' }, [
- E('h3', {}, [ _('Password hash generator') ]),
- E('div', { 'class': 'generator' }, [
- E('div', { 'class': 'control-group' }, [
- E('button', {
- 'class': 'cbi-button cbi-button-neutral',
- 'click': ui.createHandlerFn(this, () => {
- let npwn = this.map.findElement('id', '_passwd_type');
-
- if (npwn.type == 'password') {
- npwn.setAttribute('type', 'text');
- } else if (npwn.type == 'text') {
- npwn.setAttribute('type', 'password');
- }
- })
- }, '*'),
- E('input', {
- 'id': '_passwd_type',
- 'style': 'margin:5px 0',
- 'class': 'cbi-input-password',
- 'type': 'password',
- 'value': 'type new passwd here'
- })
- ]),
- E('button', {
- 'class': 'cbi-button cbi-button-action',
- 'click': ui.createHandlerFn(this, () => {
- let npw = this.map.findElement('id', '_passwd_type').value,
- button = document.querySelector('.generator > .cbi-button'),
- out = this.map.findElement('id', '_passwd_hash_out');
-
- button.setAttribute('disabled', 'true');
-
- return fs.exec('/usr/bin/openssl', [ 'passwd', '-apr1', npw ]).then((res) => {
- out.value = res.stdout || '';
- }).catch(e => {
- ui.addNotification(null, E('p', e.message), 'error');
- }).finally(() => {
- button.removeAttribute('disabled');
- });
- })
- }, [ _('GenNew') ]),
- E('input', {
- 'id': '_passwd_hash_out',
- 'style': 'margin:5px 0; width:320px',
- 'type': 'text',
- 'readonly': ''
- })
- ])
- ]);
- }, o, this);
-
- return m.render();
+ render(conf) {
+ return E([
+ E('h4', _('Edit Netdata main config: /etc/netdata/netdata.conf')),
+ E('p', {}, E('textarea', { 'style': 'width:100%', 'rows': 25, 'disabled': isReadonlyView }, [ conf != null ? conf : '' ]))
+ ]);
}
});
diff --git a/luci-app-netdata/htdocs/luci-static/resources/view/netdata/main.js b/luci-app-netdata/htdocs/luci-static/resources/view/netdata/main.js
deleted file mode 100644
index c931c6fb..00000000
--- a/luci-app-netdata/htdocs/luci-static/resources/view/netdata/main.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-'require view';
-'require uci';
-
-return view.extend({
- handleSaveApply: null,
- handleSave: null,
- handleReset: null,
-
- load() {
- return uci.load('netdata');
- },
-
- render() {
- var port = uci.get_first('netdata', 'netdata', 'port') || '19999',
- ssl = uci.get_first('netdata', 'netdata', 'enable_ssl') || '0',
- nginx = uci.get_first('netdata', 'netdata', 'nginx_support') || '0';
- if (port === '0')
- return E('div', { class: 'alert-message warning' },
- _('Port 0 is not supported.
Change to a other port and try again.'));
- return E('iframe', {
- src: (nginx === '1' ? window.location.protocol : ssl === '1' ? 'https:' : 'http:') + '//' + window.location.hostname + (nginx === '1' ? '/netdata/' : ':' + port),
- style: 'width: 100%; min-height: 100vh; border: none; border-radius: 3px;'
- });
- }
-});
diff --git a/luci-app-netdata/htdocs/luci-static/resources/view/netdata/netdata.js b/luci-app-netdata/htdocs/luci-static/resources/view/netdata/netdata.js
new file mode 100644
index 00000000..56a2e58a
--- /dev/null
+++ b/luci-app-netdata/htdocs/luci-static/resources/view/netdata/netdata.js
@@ -0,0 +1,73 @@
+// Copyright (C) 2021-2025 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/luci-app-netdata
+'use strict';
+'require view';
+'require fs';
+'require ui';
+'require uci';
+'require form';
+'require poll';
+
+return view.extend({
+
+ load: function() {
+ return uci.load('netdata');
+ },
+
+ checkRunning: function() {
+ return fs.exec('/bin/pidof', ['netdata']).then(function(pidRes) {
+ if (pidRes.code === 0) return { isRunning: true };
+ return fs.exec('/bin/ash', ['-c', 'ps | grep -q "[n]etdata"']).then(function(grepRes) {
+ return { isRunning: grepRes.code === 0 };
+ });
+ });
+ },
+
+ render: function() {
+ var self = this;
+ return this.checkRunning().then(function(checkResult) {
+ var isRunning = checkResult.isRunning;
+ let webport = uci.get_first('netdata', 'netdata', 'port') || '19999';
+ let uci_ssl = uci.get_first('netdata', 'netdata', 'enable_ssl') || '0';
+ let nginx = uci.get_first('netdata', 'netdata', 'nginx_support') || '0';
+ let protocol = nginx === '1' ? window.location.protocol : uci_ssl === '1' ? 'https:' : 'http:';
+ let buttonUrl = String.format('%s//%s:%s/#menu_system', protocol, window.location.hostname, webport);
+
+ var container = E('div');
+ if (!isRunning) {
+ var message = _('Netdata Service Not Running');
+ container.appendChild(E('div', {
+ style: 'text-align: center; padding: 2em;'
+ }, [
+ E('img', {
+ src: 'data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMjQiIGhlaWdodD0iMTAyNCIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCI+PHBhdGggZmlsbD0iI2RmMDAwMCIgZD0iTTk0Mi40MjEgMjM0LjYyNGw4MC44MTEtODAuODExLTE1My4wNDUtMTUzLjA0NS04MC44MTEgODAuODExYy03OS45NTctNTEuNjI3LTE3NS4xNDctODEuNTc5LTI3Ny4zNzYtODEuNTc5LTI4Mi43NTIgMC01MTIgMjI5LjI0OC01MTIgNTEyIDAgMTAyLjIyOSAyOS45NTIgMTk3LjQxOSA4MS41NzkgMjc3LjM3NmwtODAuODExIDgwLjgxMSAxNTMuMDQ1IDE1My4wNDUgODAuODExLTgwLjgxMWM3OS45NTcgNTEuNjI3IDE3NS4xNDcgODEuNTc5IDI3Ny4zNzYgODEuNTc5IDI4Mi43NTIgMCA1MTItMjI5LjI0OCA1MTItNTEyIDAtMTAyLjIyOS0yOS45NTItMTk3LjQxOS04MS41NzktMjc3LjM3NnpNMTk0Ljk0NCA1MTJjMC0xNzUuMTA0IDE0MS45NTItMzE3LjA1NiAzMTcuMDU2LTMxNy4wNTYgNDggMCA5My40ODMgMTAuNjY3IDEzNC4yMjkgMjkuNzgxbC00MjEuNTQ3IDQyMS41NDdjLTE5LjA3Mi00MC43ODktMjkuNzM5LTg2LjI3Mi0yOS43MzktMTM0LjI3MnpNNTEyIDgyOS4wNTZjLTQ4IDAtOTMuNDgzLTEwLjY2Ny0xMzQuMjI5LTI5Ljc4MWw0MjEuNTQ3LTQyMS41NDdjMTkuMDcyIDQwLjc4OSAyOS43ODEgODYuMjcyIDI5Ljc4MSAxMzQuMjI5LTAuMDQzIDE3NS4xNDctMTQxLjk5NSAzMTcuMDk5LTMxNy4wOTkgMzE3LjA5OXoiLz48L3N2Zz4=',
+ style: 'width: 100px; height: 100px; margin-bottom: 1em;'
+ }),
+ E('h2', {}, message)
+ ]));
+ } else {
+ var iframe = E('iframe', {
+ src: buttonUrl,
+ style: 'width: 100%; min-height: 100vh; border: none;'
+ });
+ container.appendChild(iframe);
+ }
+
+ poll.add(function() {
+ return self.checkRunning().then(function(checkResult) {
+ var newStatus = checkResult.isRunning;
+ if (newStatus !== isRunning) {
+ window.location.reload();
+ }
+ });
+ }, 5);
+
+ poll.start();
+
+ return container;
+ });
+ },
+
+ handleSaveApply: null,
+ handleSave: null,
+ handleReset: null
+});
\ No newline at end of file
diff --git a/luci-app-netdata/po/templates/netdata.pot b/luci-app-netdata/po/templates/netdata.pot
deleted file mode 100644
index 9bf7e623..00000000
--- a/luci-app-netdata/po/templates/netdata.pot
+++ /dev/null
@@ -1,93 +0,0 @@
-msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
-
-#: applications/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json:30
-msgid "Advanced"
-msgstr ""
-
-#: applications/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json:22
-msgid "Config"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/advanced.js:21
-msgid "Contents have been saved."
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/advanced.js:31
-msgid "Edit Netdata main config: /etc/netdata/netdata.conf"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:30
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:49
-msgid "Enable Auth"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:38
-msgid "Enable SSL"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:63
-msgid "Enable logger"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:134
-msgid "GenNew"
-msgstr ""
-
-#: applications/luci-app-netdata/root/usr/share/rpcd/acl.d/luci-app-netdata.json:3
-msgid "Grant UCI access for netdata"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:57
-msgid "Login Username and Password hash"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:75
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:83
-#: applications/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json:3
-#: applications/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json:14
-msgid "Netdata"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:67
-msgid "Open"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:66
-msgid "Open Web UI"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:94
-msgid "Password hash generator"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/main.js:19
-msgid "Port 0 is not supported.
Change to a other port and try again."
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:33
-msgid "Service port"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:75
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:76
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:83
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:84
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:41
-msgid ""
-"To enable this feature you need install luci-nginx and luci-ssl-"
-"nginx
first"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/advanced.js:25
-msgid "Unable to save contents: %s"
-msgstr ""
diff --git a/luci-app-netdata/po/zh_Hans/netdata.po b/luci-app-netdata/po/zh_Hans/netdata.po
index 315d4658..13c59159 100644
--- a/luci-app-netdata/po/zh_Hans/netdata.po
+++ b/luci-app-netdata/po/zh_Hans/netdata.po
@@ -1,104 +1,55 @@
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2023-04-28 11:30+0000\n"
-"Last-Translator: muink \n"
-"Language-Team: Chinese (Simplified) \n"
-"Language: zh_Hans\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.12.1-dev\n"
-#: applications/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json:30
-msgid "Advanced"
-msgstr "高级"
+msgid "Netdata"
+msgstr "实时监控"
-#: applications/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json:22
-msgid "Config"
-msgstr "配置"
+msgid "Basic Setting"
+msgstr "基本设置"
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/advanced.js:21
-msgid "Contents have been saved."
-msgstr ""
+msgid "Config Setting"
+msgstr "配置文件"
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/advanced.js:31
msgid "Edit Netdata main config: /etc/netdata/netdata.conf"
msgstr "编辑 Netdata 主配置: /etc/netdata/netdata.conf"
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:30
msgid "Enable"
msgstr "启用"
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:49
-msgid "Enable Auth"
-msgstr "启用验证"
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:38
+
msgid "Enable SSL"
-msgstr "启用 SSL"
+msgstr "SSL启用https访问"
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:63
msgid "Enable logger"
msgstr "启用日志记录器"
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:134
-msgid "GenNew"
-msgstr "生成新的"
+msgid "An open-source real-time performance monitoring and visualization tool"
+msgstr "一款开源的实时性能监控与可视化工具"
-#: applications/luci-app-netdata/root/usr/share/rpcd/acl.d/luci-app-netdata.json:3
-msgid "Grant UCI access for netdata"
-msgstr "授予访问 LuCI 应用 netdata 的权限"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:57
-msgid "Login Username and Password hash"
-msgstr "登入用户名和密码哈希"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:75
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:83
-#: applications/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json:3
-#: applications/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json:14
-msgid "Netdata"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:67
-msgid "Open"
-msgstr "打开"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:66
msgid "Open Web UI"
-msgstr "打开 Web UI"
+msgstr "打开Web网页"
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:94
-msgid "Password hash generator"
-msgstr "密码哈希生成器"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/main.js:19
-msgid "Port 0 is not supported.
Change to a other port and try again."
-msgstr "不支持端口 0。
改为其他端口然后再试一次。"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:33
msgid "Service port"
msgstr "服务端口"
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:75
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:76
-msgid "Start"
-msgstr "启动"
+msgid "NOT RUNNING"
+msgstr "未运行"
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:83
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:84
-msgid "Stop"
-msgstr "停止"
+msgid "RUNNING"
+msgstr "运行中"
+
+msgid "Netdata Service Not Running"
+msgstr "Netdata服务未启用"
+
+msgid "Cert file"
+msgstr "Cert文件"
+
+msgid "Cert Key file"
+msgstr "Cert密钥文件"
+
+msgid ""
+msgstr ""
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:41
msgid ""
-"To enable this feature you need install luci-nginx and luci-ssl-"
-"nginx
first"
-msgstr "要启用此功能必须先安装 luci-nginx 和 luci-ssl-nginx
"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/advanced.js:25
-msgid "Unable to save contents: %s"
msgstr ""
diff --git a/luci-app-netdata/po/zh_Hant/netdata.po b/luci-app-netdata/po/zh_Hant/netdata.po
deleted file mode 100644
index 4abb7deb..00000000
--- a/luci-app-netdata/po/zh_Hant/netdata.po
+++ /dev/null
@@ -1,104 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2023-04-28 11:30+0000\n"
-"Last-Translator: muink \n"
-"Language-Team: Chinese (Traditional) \n"
-"Language: zh_Hant\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.12.1-dev\n"
-
-#: applications/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json:30
-msgid "Advanced"
-msgstr "進階"
-
-#: applications/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json:22
-msgid "Config"
-msgstr "組態"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/advanced.js:21
-msgid "Contents have been saved."
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/advanced.js:31
-msgid "Edit Netdata main config: /etc/netdata/netdata.conf"
-msgstr "編輯 Netdata 主要配置: /etc/netdata/netdata.conf"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:30
-msgid "Enable"
-msgstr "啟用"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:49
-msgid "Enable Auth"
-msgstr "啟用認證"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:38
-msgid "Enable SSL"
-msgstr "啟用 SSL"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:63
-msgid "Enable logger"
-msgstr "啟用日誌記錄器"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:134
-msgid "GenNew"
-msgstr "生成新的"
-
-#: applications/luci-app-netdata/root/usr/share/rpcd/acl.d/luci-app-netdata.json:3
-msgid "Grant UCI access for netdata"
-msgstr "授予訪問 LuCI 應用 netdata 的權限"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:57
-msgid "Login Username and Password hash"
-msgstr "登入用戶名和密碼雜湊"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:75
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:83
-#: applications/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json:3
-#: applications/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json:14
-msgid "Netdata"
-msgstr ""
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:67
-msgid "Open"
-msgstr "開啟"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:66
-msgid "Open Web UI"
-msgstr "開啟 Web UI"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:94
-msgid "Password hash generator"
-msgstr "密碼雜湊產生器"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/main.js:19
-msgid "Port 0 is not supported.
Change to a other port and try again."
-msgstr "不支援埠號為 0。
變更為其他埠後重試。"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:33
-msgid "Service port"
-msgstr "伺服通訊埠"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:75
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:76
-msgid "Start"
-msgstr "啟動"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:83
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:84
-msgid "Stop"
-msgstr "停止"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/config.js:41
-msgid ""
-"To enable this feature you need install luci-nginx and luci-ssl-"
-"nginx
first"
-msgstr "要啟用此功能必須先安裝 luci-nginx 和 luci-ssl-nginx
"
-
-#: applications/luci-app-netdata/htdocs/luci-static/resources/view/netdata/advanced.js:25
-msgid "Unable to save contents: %s"
-msgstr ""
diff --git a/luci-app-netdata/root/etc/uci-defaults/luci-app-netdata b/luci-app-netdata/root/etc/uci-defaults/luci-app-netdata
new file mode 100644
index 00000000..eb9c7ad8
--- /dev/null
+++ b/luci-app-netdata/root/etc/uci-defaults/luci-app-netdata
@@ -0,0 +1,30 @@
+#!/bin/sh
+[ ! -f "/usr/share/ucitrack/luci-app-netdata.json" ] && {
+ cat > /usr/share/ucitrack/luci-app-netdata.json << EEOF
+{
+ "config": "netdata",
+ "init": "netdata"
+}
+EEOF
+}
+# [ -f /usr/share/netdata/webcn/netdata.conf ] && mv -f /usr/share/netdata/webcn/netdata.conf /etc/netdata/netdata.conf
+[ -f /usr/share/netdata/webcn/netdata.config ] && mv -f /usr/share/netdata/webcn/netdata.config /etc/config/netdata
+[ -f /usr/share/netdata/webcn/netdata.init ] && mv -f /usr/share/netdata/webcn/netdata.init /etc/init.d/netdata
+
+chmod +x /etc/init.d/netdata
+
+[ -f "/etc/config/ucitrack" ] && {
+uci -q batch <<-EOF >/dev/null
+ delete ucitrack.@netdata[-1]
+ add ucitrack netdata
+ set ucitrack.@netdata[-1].init=netdata
+ commit ucitrack
+EOF
+}
+
+rm -f /tmp/luci-indexcache* 2>/dev/null
+rm -f /tmp/luci-modulecache/* 2>/dev/null # OpenWrt 21.02
+rm -f /tmp/luci-indexcache
+
+rm -rf /tmp/luci-*
+exit 0
\ No newline at end of file
diff --git a/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json b/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json
index ba3a6ed6..7658c23b 100644
--- a/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json
+++ b/luci-app-netdata/root/usr/share/luci/menu.d/luci-app-netdata.json
@@ -12,26 +12,26 @@
},
"admin/status/netdata/netdata": {
"title": "Netdata",
- "order": 1,
+ "order": 10,
"action": {
"type": "view",
- "path": "netdata/main"
+ "path": "netdata/netdata"
+ }
+ },
+ "admin/status/netdata/basic": {
+ "title": "Basic Setting",
+ "order": 20,
+ "action": {
+ "type": "view",
+ "path": "netdata/basic"
}
},
"admin/status/netdata/config": {
- "title": "Config",
- "order": 2,
+ "title": "Config Setting",
+ "order": 30,
"action": {
"type": "view",
"path": "netdata/config"
}
- },
- "admin/status/netdata/advanced": {
- "title": "Advanced",
- "order": 3,
- "action": {
- "type": "view",
- "path": "netdata/advanced"
- }
}
}
diff --git a/luci-app-netdata/root/usr/share/netdata/webcn/netdata.conf b/luci-app-netdata/root/usr/share/netdata/webcn/netdata.conf
new file mode 100644
index 00000000..28131f6d
--- /dev/null
+++ b/luci-app-netdata/root/usr/share/netdata/webcn/netdata.conf
@@ -0,0 +1,33 @@
+# Full configuration can be retrieved from the running
+# server at http://localhost:19999/netdata.conf
+#
+# Example:
+# curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf
+#
+
+[global]
+ update every = 2
+ memory deduplication (ksm) = no
+ debug log = none
+ error log = none
+ access log = none
+ run as user = root
+
+[web]
+ default port = 19999
+ allow connections from = *
+ allow dashboard from = *
+
+[plugins]
+ cgroups = no
+ apps = no
+ charts.d = no
+ fping = no
+ node.d = no
+ python.d = no
+
+[health]
+ enabled = no
+
+[plugin:proc:ipc]
+ shared memory totals = no
diff --git a/luci-app-netdata/root/usr/share/netdata/webcn/netdata.config b/luci-app-netdata/root/usr/share/netdata/webcn/netdata.config
new file mode 100644
index 00000000..2db1811b
--- /dev/null
+++ b/luci-app-netdata/root/usr/share/netdata/webcn/netdata.config
@@ -0,0 +1,3 @@
+config netdata 'netdata'
+ option enabled '0'
+ option port '19999'
\ No newline at end of file
diff --git a/luci-app-netdata/root/usr/share/netdata/webcn/netdata.init b/luci-app-netdata/root/usr/share/netdata/webcn/netdata.init
new file mode 100644
index 00000000..f2db196e
--- /dev/null
+++ b/luci-app-netdata/root/usr/share/netdata/webcn/netdata.init
@@ -0,0 +1,105 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+USE_PROCD=1
+
+APPBINARY=/usr/sbin/netdata
+CONFIGFILE=/etc/netdata/netdata.conf
+
+config_load 'netdata'
+
+get_config() {
+ config_get_bool enabled $1 enabled 0
+ config_get port $1 port 19999
+ config_get_bool ssl $1 enable_ssl 0
+ config_get cert_file $1 cert_file '/etc/ssl/ezopwrt.crt'
+ config_get key_file $1 key_file '/etc/ssl/ezopwrt.key'
+ config_get_bool ennginx $1 nginx_support 0
+ config_get_bool auth $1 auth 0
+ config_get userpw $1 user_passwd 'admin:$apr1$t7qQjoqb$YBHtAb7VGSkjIdObMG.Oy0'
+ [ "$ennginx" == "1" ] && ssl=0
+}
+
+#read_option