Merge pull request 'reverse proxy: also add tag-based headers for redirections' (#17) from Armael/tricot:headers_for_redirects into main

Reviewed-on: Deuxfleurs/tricot#17

.gitignore

@@ -1,3 +1,5 @@
 /target
+result
+result-bin
 run_local.sh
 dhat-heap.json

.woodpecker.yml

@@ -0,0 +1,26 @@
+when:
+  event:
+  - push
+  - pull_request
+  - tag
+  - cron
+  - manual
+
+steps:
+  - name: check formatting
+    image: nixpkgs/nix:nixos-22.05
+    environment:
+      NIX_PATH: 'nixpkgs=channel:nixos-22.05'
+    commands:
+      - nix-shell -p cargo -p rustfmt --run 'cargo fmt -- --check'
+
+  - name: build
+    image: nixpkgs/nix:nixos-22.05
+    commands:
+      - nix build --extra-experimental-features nix-command --extra-experimental-features flakes .#debug.x86_64-linux.tricot
+
+  - name: test
+    image: nixpkgs/nix:nixos-22.05
+    commands:
+      - nix build --extra-experimental-features nix-command --extra-experimental-features flakes .#test.x86_64-linux.tricot
+      - ./result-bin/bin/tricot-*

Cargo.toml

@@ -7,34 +7,38 @@ authors = ["Alex Auvolat <alex@adnab.me>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.28"
+anyhow = "1.0.66"
 envy = "0.4"
 futures = "0.3"
-log = "0.4"
+tracing = { version = "0.1.30" }
-pretty_env_logger = "0.4"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 regex = "1"
 reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls-manual-roots" ] }
-serde = { version = "1.0.107", features = ["derive"] }
+serde = { version = "1.0.149", features = ["derive"] }
-serde_json = "1.0.53"
+serde_json = "1.0.89"
-tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] }
+tokio = { version = "1.22", default-features = false, features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] }
 bytes = "1"
 acme-micro = "0.12"
-rustls = { version =  "0.20", features = [ "dangerous_configuration" ] }
+rustls = { version =  "0.21", features = [ "dangerous_configuration" ] }
-rustls-pemfile = "0.2"
+rustls-pemfile = "1.0"
 chrono = { version = "0.4", features = [ "serde" ] }
 hyper = { version = "0.14", features = [ "full" ] }
 futures-util = "0.3"
-tokio-rustls = "0.23"
+tokio-rustls = "0.24"
-hyper-rustls = "0.23"
+hyper-rustls = "0.24"
 http = "0.2"
-hyper-reverse-proxy = "0.4"
 structopt = "0.3"
 glob = "0.3"
-rcgen = "0.8"
+rcgen = "0.11"
 accept-encoding-fork = "0.2.0-alpha.3"
-async-compression = { version = "0.3", features = ["tokio", "gzip", "zstd", "deflate", "brotli"] }
+async-compression = { version = "0.4", features = ["tokio", "gzip", "zstd", "deflate", "brotli"] }
-tokio-util = { version = "0.6", features = ["io"] }
+tokio-util = { version = "0.7", features = ["io"] }
-uuid = { version = "0.8.2", features = ["v4"] }
+uuid = { version = "1.2", features = ["v4"] }
+opentelemetry = "0.20"
+opentelemetry-prometheus = "0.13"
+prometheus = "0.13"
+df-consul = "0.3.5"
+
 dhat = { version = "0.3", optional = true }
 
 [profile.release]

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.58-buster as builder
+FROM rust:1.68-buster as builder
 
 RUN apt-get update && \
     apt-get install -y libssl-dev pkg-config

LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 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 Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are 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.
+
+  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.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  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 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 work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  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 AGPL, see
+<https://www.gnu.org/licenses/>.

README.md

@@ -1,5 +1,7 @@
 # Tricot
 
+[![status-badge](https://woodpecker.deuxfleurs.fr/api/badges/36/status.svg)](https://woodpecker.deuxfleurs.fr/repos/36)
+
 Tricot is a reverse-proxy for exposing your services via TLS that integrates well with Consul and Nomad.
 
 Tricot does the following things:
@@ -27,7 +29,8 @@ Tricot uses the following environment variables for its configuration (they can
 - `TRICOT_ENABLE_COMPRESSION` (default: `false`): whether to enable transparent compression of data coming back from backends
 - `TRICOT_COMPRESS_MIME_TYPES` (default: `text/html,text/plain,text/css,text/javascript,text/xml,application/javascript,application/json,application/xml,image/svg+xml,font/ttf`): comma-separated list of MIME types for which Tricot will do compression
 
-[Here is an example of how to run Tricot as a Nomad service](https://git.deuxfleurs.fr/Deuxfleurs/nixcfg/src/branch/main/app/frontend/deploy/frontend-tricot.hcl) (in this example it also integrates with [Diplonat](https://git.deuxfleurs.fr/Deuxfleurs/diplonat)).
+[Here is an example of how to run Tricot as a Nomad service](https://git.deuxfleurs.fr/Deuxfleurs/nixcfg/src/commit/1a11ff42029e0a6cb5f5b9c34043af9d6d52e5ab/cluster/prod/app/core/deploy/tricot.hcl)
+(in this example it also integrates with [Diplonat](https://git.deuxfleurs.fr/Deuxfleurs/diplonat)).
 
 ## Adding and priorizing backends
 
@@ -39,15 +42,16 @@ Backends are configured by adding tags of the following form to the services in
 - `tricot myapp.example.com/path/to_subresource 10`: combining the previous two examples
 - `tricot-https myapp.example.com`: same, but indicates that the backend service handling the request expects an HTTPS request and not an HTTP request. In this case, Tricot will do everything in its power to NOT verify the backend's TLS certificate (ignore self-signed certificate, ignore TLS hostname, etc).
 - `tricot-add-header Access-Control-Allow-Origin *`: add the `Access-Control-Allow-Origin: *` header to all of the HTTP responses when they are proxied back to the client
+- `tricot-add-redirect old.example.com/maybe_subpath new.example.com/new/subpath 301`: redirects paths that match the first pattern to the second pattern with the given HTTP status code. More info in [PR#10](https://git.deuxfleurs.fr/Deuxfleurs/tricot/pulls/10).
 - `tricot-global-lb`: load-balance incoming requests to all matching backends
 - `tricot-site-lb`: load-balance incoming requests to all matching backends that are in the same site (geographical location); when site information about nodes is not available, this is equivalent to `tricot-global-lb`
 
 Any number of such rules can be combined freely.
 
-[Here](https://git.deuxfleurs.fr/Deuxfleurs/nixcfg/src/branch/main/app/dummy/deploy/dummy-nginx.hcl)
+[Here](https://git.deuxfleurs.fr/Deuxfleurs/nixcfg/src/commit/981294e3d7a180a3c08f8173dc652b73b6e2bd07/cluster/staging/app/dummy/deploy/dummy-nginx.hcl)
-[are](https://git.deuxfleurs.fr/Deuxfleurs/nixcfg/src/branch/main/app/garage-staging/deploy/garage.hcl)
+[are](https://git.deuxfleurs.fr/Deuxfleurs/nixcfg/src/commit/1a11ff42029e0a6cb5f5b9c34043af9d6d52e5ab/cluster/prod/app/garage/deploy/garage.hcl)
-[some](https://git.deuxfleurs.fr/Deuxfleurs/nixcfg/src/branch/main/app/im/deploy/im.hcl)
+[some](https://git.deuxfleurs.fr/Deuxfleurs/nixcfg/src/commit/1a11ff42029e0a6cb5f5b9c34043af9d6d52e5ab/cluster/prod/app/matrix/deploy/im.hcl)
-[examples](https://git.deuxfleurs.fr/Deuxfleurs/infrastructure/src/branch/main/app/jitsi/deploy/jitsi.hcl).
+[examples](https://git.deuxfleurs.fr/Deuxfleurs/nixcfg/src/commit/1a11ff42029e0a6cb5f5b9c34043af9d6d52e5ab/cluster/prod/app/jitsi/deploy/jitsi.hcl).
 
 ## How Tricot matches backends
 
@@ -67,3 +71,8 @@ Logs are the privileged place to get information about what Tricot is doing. You
 - `RUST_LOG=tricot=info`: Tricot will dump the proxy configuration (the set of rules it uses to match backends) each time it changes, and will show a line for each incoming request (but it won't indicate which backend the request was routed to). You will also get information about certificate obtention and renewal using Let's Encrypt.
 - `RUST_LOG=tricot=debug`: Tricot will show for each request the backend to which it is routed. It will also show all of its interactions with Consul
 - `RUST_LOG=tricot=trace`: Tricot will show details such as the request's headers for all request at all stages of proxying.
+
+
+## License
+
+This software is published under the AGPLv3 license.

doc/Grafana Tricot global.json

@@ -0,0 +1,964 @@
+{
+  "__inputs": [
+    {
+      "name": "DS_DS_PROMETHEUS",
+      "label": "DS_PROMETHEUS",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    }
+  ],
+  "__elements": {},
+  "__requires": [
+    {
+      "type": "panel",
+      "id": "gauge",
+      "name": "Gauge",
+      "version": ""
+    },
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "9.3.1"
+    },
+    {
+      "type": "panel",
+      "id": "piechart",
+      "name": "Pie chart",
+      "version": ""
+    },
+    {
+      "type": "datasource",
+      "id": "prometheus",
+      "name": "Prometheus",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "timeseries",
+      "name": "Time series",
+      "version": ""
+    }
+  ],
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": false,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "max": 300,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "yellow",
+                "value": 100
+              },
+              {
+                "color": "red",
+                "value": 200
+              }
+            ]
+          },
+          "unit": "reqps"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 6,
+        "x": 0,
+        "y": 0
+      },
+      "id": 8,
+      "options": {
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showThresholdLabels": false,
+        "showThresholdMarkers": true
+      },
+      "pluginVersion": "9.3.1",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum (rate(https_requests_served{job=\"tricot\"}[$__rate_interval]))",
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Request rate",
+      "type": "gauge"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "opacity",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "s"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 6,
+        "x": 6,
+        "y": 0
+      },
+      "id": 14,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "9.2.6",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum(rate(https_request_proxy_duration_sum{job=\"tricot\"}[$__rate_interval])) / sum(rate(https_request_proxy_duration_count{job=\"tricot\"}[$__rate_interval]))",
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "Average",
+          "range": true,
+          "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "histogram_quantile(0.5, sum(rate(https_request_proxy_duration_bucket[$__rate_interval])) by (le))",
+          "hide": false,
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "50%",
+          "range": true,
+          "refId": "D"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "histogram_quantile(0.90, sum(rate(https_request_proxy_duration_bucket[$__rate_interval])) by (le))",
+          "hide": false,
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "90%",
+          "range": true,
+          "refId": "B"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "histogram_quantile(0.99, sum(rate(https_request_proxy_duration_bucket[$__rate_interval])) by (le))",
+          "hide": false,
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "99%",
+          "range": true,
+          "refId": "C"
+        }
+      ],
+      "title": "Response time",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            }
+          },
+          "mappings": [],
+          "unit": "reqps"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 4,
+        "x": 12,
+        "y": 0
+      },
+      "id": 11,
+      "options": {
+        "displayLabels": [
+          "name"
+        ],
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": false
+        },
+        "pieType": "pie",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "desc"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum by(service) (rate(https_requests_served{status_code=~\"2.+\", job=\"tricot\"}[$__range]))",
+          "instant": true,
+          "interval": "",
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "{{service}}",
+          "range": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Requests per service",
+      "type": "piechart"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "bars",
+            "fillOpacity": 100,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "reqps"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 8,
+        "x": 16,
+        "y": 0
+      },
+      "id": 4,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "expr": "sum by(method, status_code) (rate(https_requests_served{status_code=~\"2.+\", job=\"tricot\"}[$__rate_interval]))",
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "{{method}} {{status_code}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Status success",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "bars",
+            "fillOpacity": 100,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "reqps"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 8
+      },
+      "id": 1,
+      "options": {
+        "legend": {
+          "calcs": [
+            "mean",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true,
+          "sortBy": "Mean",
+          "sortDesc": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum by(service) (rate(https_requests_served{job=\"tricot\"}[$__rate_interval]))",
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Requests served per service",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "bars",
+            "fillOpacity": 100,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "reqps"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 12,
+        "y": 8
+      },
+      "id": 7,
+      "options": {
+        "legend": {
+          "calcs": [
+            "mean",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true,
+          "sortBy": "Max",
+          "sortDesc": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum by(method, status_code) (rate(https_requests_served{status_code!~\"2.+\", job=\"tricot\"}[$__rate_interval]))",
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "{{method}} {{status_code}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Status != 200 OK",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 17,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 7,
+        "x": 0,
+        "y": 17
+      },
+      "id": 6,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "expr": "sum by(host) (proxy_config_entries{job=\"tricot\"})",
+          "instant": false,
+          "key": "Q-f0ebfca9-6429-43f7-8617-af76a4be3918-0",
+          "legendFormat": "{{host}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Backends per domain",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            }
+          },
+          "mappings": []
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 4,
+        "x": 7,
+        "y": 17
+      },
+      "id": 16,
+      "options": {
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "pieType": "donut",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "9.3.1",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum  (rate(https_requests_served{job=\"tricot\", same_site=\"true\", same_node=\"true\"}[$__range]))",
+          "instant": true,
+          "legendFormat": "Local node",
+          "range": false,
+          "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum  (rate(https_requests_served{job=\"tricot\", same_site=\"true\", same_node=\"false\"}[$__range]))",
+          "hide": false,
+          "instant": true,
+          "legendFormat": "Node in same site",
+          "range": false,
+          "refId": "B"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum  (rate(https_requests_served{job=\"tricot\", same_site=\"false\"}[$__range]))",
+          "hide": false,
+          "instant": true,
+          "legendFormat": "Node in another site",
+          "range": false,
+          "refId": "C"
+        }
+      ],
+      "title": "Requests served by",
+      "type": "piechart"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "bars",
+            "fillOpacity": 100,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "reqps"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 13,
+        "x": 11,
+        "y": 17
+      },
+      "id": 2,
+      "options": {
+        "legend": {
+          "calcs": [
+            "min",
+            "mean",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true,
+          "sortBy": "Mean",
+          "sortDesc": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "builder",
+          "expr": "sum by(service, target_addr) (rate(https_requests_served{job=\"tricot\"}[$__rate_interval]))",
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "{{service}}@{{target_addr}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Requests served per backend server",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": "10s",
+  "schemaVersion": 37,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-30m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Tricot global",
+  "uid": "H6ChABK4k",
+  "version": 37,
+  "weekStart": ""
+}

doc/Grafana Tricot per-service.json

@@ -0,0 +1,994 @@
+{
+  "__inputs": [
+    {
+      "name": "DS_DS_PROMETHEUS",
+      "label": "DS_PROMETHEUS",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    }
+  ],
+  "__elements": {},
+  "__requires": [
+    {
+      "type": "panel",
+      "id": "gauge",
+      "name": "Gauge",
+      "version": ""
+    },
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "9.3.1"
+    },
+    {
+      "type": "panel",
+      "id": "piechart",
+      "name": "Pie chart",
+      "version": ""
+    },
+    {
+      "type": "datasource",
+      "id": "prometheus",
+      "name": "Prometheus",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "timeseries",
+      "name": "Time series",
+      "version": ""
+    }
+  ],
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": false,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "max": 300,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "yellow",
+                "value": 100
+              },
+              {
+                "color": "red",
+                "value": 200
+              }
+            ]
+          },
+          "unit": "reqps"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 6,
+        "x": 0,
+        "y": 0
+      },
+      "id": 8,
+      "options": {
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showThresholdLabels": false,
+        "showThresholdMarkers": true
+      },
+      "pluginVersion": "9.3.1",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum (rate(https_requests_served{job=\"tricot\",service=\"$service\"}[$__rate_interval]))",
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Request rate",
+      "type": "gauge"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            }
+          },
+          "mappings": [],
+          "unit": "reqps"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 6,
+        "x": 6,
+        "y": 0
+      },
+      "id": 11,
+      "options": {
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "pieType": "pie",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum by(method, status_code) (rate(https_requests_served{status_code=~\"2.+\", job=\"tricot\", service=\"$service\"}[$__range]))",
+          "instant": true,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "{{method}} {{status_code}}",
+          "range": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Status success",
+      "type": "piechart"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "bars",
+            "fillOpacity": 100,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "reqps"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "id": 4,
+      "options": {
+        "legend": {
+          "calcs": [
+            "mean",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "expr": "sum by(method, status_code) (rate(https_requests_served{status_code=~\"2.+\", job=\"tricot\", service=\"$service\"}[$__rate_interval]))",
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "{{method}} {{status_code}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Status success",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "bars",
+            "fillOpacity": 100,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "reqps"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 10,
+        "x": 0,
+        "y": 8
+      },
+      "id": 1,
+      "options": {
+        "legend": {
+          "calcs": [
+            "mean",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true,
+          "sortBy": "Mean",
+          "sortDesc": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum by(target_addr) (rate(https_requests_served{job=\"tricot\",service=\"$service\"}[$__rate_interval]))",
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Requests served per backend",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "opacity",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "s"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 5,
+        "x": 10,
+        "y": 8
+      },
+      "id": 14,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "9.2.6",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum(rate(https_request_proxy_duration_sum{job=\"tricot\",service=\"$service\"}[$__rate_interval])) / sum(rate(https_request_proxy_duration_count{job=\"tricot\",service=\"$service\"}[$__rate_interval]))",
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "Average",
+          "range": true,
+          "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "histogram_quantile(0.5, sum(rate(https_request_proxy_duration_bucket{job=\"tricot\",service=\"$service\"}[$__rate_interval])) by (le))",
+          "hide": false,
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "50%",
+          "range": true,
+          "refId": "D"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "histogram_quantile(0.90, sum(rate(https_request_proxy_duration_bucket{job=\"tricot\",service=\"$service\"}[$__rate_interval])) by (le))",
+          "hide": false,
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "90%",
+          "range": true,
+          "refId": "B"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "histogram_quantile(0.99, sum(rate(https_request_proxy_duration_bucket{job=\"tricot\",service=\"$service\"}[$__rate_interval])) by (le))",
+          "hide": false,
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "99%",
+          "range": true,
+          "refId": "C"
+        }
+      ],
+      "title": "Response time",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "bars",
+            "fillOpacity": 100,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "reqps"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 9,
+        "x": 15,
+        "y": 8
+      },
+      "id": 7,
+      "options": {
+        "legend": {
+          "calcs": [
+            "mean",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true,
+          "sortBy": "Max",
+          "sortDesc": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum by(method, status_code) (rate(https_requests_served{status_code!~\"2.+\", job=\"tricot\", service=\"$service\"}[$__rate_interval]))",
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "{{method}} {{status_code}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Status != 200 OK",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "opacity",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "s"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 10,
+        "x": 0,
+        "y": 17
+      },
+      "id": 16,
+      "options": {
+        "legend": {
+          "calcs": [
+            "mean",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true,
+          "sortBy": "Mean",
+          "sortDesc": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "9.2.6",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum by (target_addr)(rate(https_request_proxy_duration_sum{job=\"tricot\",service=\"$service\"}[$__rate_interval])) / sum by (target_addr)(rate(https_request_proxy_duration_count{job=\"tricot\",service=\"$service\"}[$__rate_interval]))",
+          "instant": false,
+          "interval": "",
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "{{target_addr}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Response time per backend",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            }
+          },
+          "mappings": []
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 4,
+        "x": 10,
+        "y": 17
+      },
+      "id": 18,
+      "options": {
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "pieType": "donut",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "9.3.1",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum  (rate(https_requests_served{job=\"tricot\", same_site=\"true\", same_node=\"true\", service=\"$service\"}[$__range]))",
+          "instant": true,
+          "legendFormat": "Local node",
+          "range": false,
+          "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum  (rate(https_requests_served{job=\"tricot\", same_site=\"true\", same_node=\"false\",service=\"$service\"}[$__range]))",
+          "hide": false,
+          "instant": true,
+          "legendFormat": "Node in same site",
+          "range": false,
+          "refId": "B"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum  (rate(https_requests_served{job=\"tricot\", same_site=\"false\",service=\"$service\"}[$__range]))",
+          "hide": false,
+          "instant": true,
+          "legendFormat": "Node in another site",
+          "range": false,
+          "refId": "C"
+        }
+      ],
+      "title": "Requests served by",
+      "type": "piechart"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "bars",
+            "fillOpacity": 100,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "reqps"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 10,
+        "x": 14,
+        "y": 17
+      },
+      "id": 15,
+      "options": {
+        "legend": {
+          "calcs": [
+            "mean",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true,
+          "sortBy": "Max",
+          "sortDesc": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum by(target_addr, method, status_code) (rate(https_requests_served{status_code!~\"2.+\", job=\"tricot\", service=\"$service\"}[$__rate_interval]))",
+          "instant": false,
+          "key": "Q-b2139746-a221-47de-a50b-fadc128d0021-0",
+          "legendFormat": "{{target_addr}} {{method}} {{status_code}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Status != 200 OK, per backend",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": "10s",
+  "schemaVersion": 37,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": [
+      {
+        "current": {},
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${DS_DS_PROMETHEUS}"
+        },
+        "definition": "https_requests_served{job=\"tricot\"}",
+        "hide": 0,
+        "includeAll": false,
+        "multi": false,
+        "name": "service",
+        "options": [],
+        "query": {
+          "query": "https_requests_served{job=\"tricot\"}",
+          "refId": "StandardVariableQuery"
+        },
+        "refresh": 1,
+        "regex": "/service=\"([a-z0-9-]+)\"/",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-30m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Tricot per-service",
+  "uid": "u930OPFVz",
+  "version": 9,
+  "weekStart": ""
+}

flake.lock

@@ -0,0 +1,105 @@
+{
+  "nodes": {
+    "cargo2nix": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1713199118,
+        "narHash": "sha256-MlLdAvk+zXCFUy280sY6LqtykqWXIkKVXo72J7a6HlU=",
+        "owner": "cargo2nix",
+        "repo": "cargo2nix",
+        "rev": "1efb03f2f794ad5eed17e807e858c4da001dbc3e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cargo2nix",
+        "repo": "cargo2nix",
+        "rev": "1efb03f2f794ad5eed17e807e858c4da001dbc3e",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1731094700,
+        "narHash": "sha256-lSiVjHP7sgnCt2hZabnq+tCLmBerDKmAdd2CS6BrBjw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "551ba0fa7653afb9d590db225c3bcbccf68931c0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "551ba0fa7653afb9d590db225c3bcbccf68931c0",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "cargo2nix": "cargo2nix",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "cargo2nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731032894,
+        "narHash": "sha256-dQSyYPmrQiPr+PGEd+K8038rubFGz7G/dNXVeaGWE0w=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "d52f2a4c103a0acf09ded857b9e2519ae2360e59",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "d52f2a4c103a0acf09ded857b9e2519ae2360e59",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,61 @@
+{
+  description = "Tricot, a reverse proxy with consul integration";
+
+  # Nixpkgs 24.05 as of 2024-11-08, has rustc v1.77.2
+  inputs.nixpkgs.url =
+    "github:NixOS/nixpkgs/551ba0fa7653afb9d590db225c3bcbccf68931c0";
+  inputs.cargo2nix = {
+    # cargo2nix as of 2024-04-25
+    # NB: upgrading to a more recent commit of cargo2nix will not work (as of 2024-11-08),
+    # because the patch making openssl-sys cross-compilation work has been reverted.
+    # (patch: https://github.com/cargo2nix/cargo2nix/pull/237,
+    #  revert: https://github.com/cargo2nix/cargo2nix/commit/cfd086deb565314f3a11b5bb25807a3ce17315d4)
+    url = "github:cargo2nix/cargo2nix/1efb03f2f794ad5eed17e807e858c4da001dbc3e";
+
+    # Rust overlay as of 2024-11-08
+    inputs.rust-overlay.url =
+      "github:oxalica/rust-overlay/d52f2a4c103a0acf09ded857b9e2519ae2360e59";
+
+    inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  outputs = { self, nixpkgs, cargo2nix }:
+  let
+    targetHost = "x86_64-unknown-linux-musl";
+    pkgs = import nixpkgs {
+      system = "x86_64-linux";
+      crossSystem = {
+        config = targetHost;
+        isStatic = true;
+      };
+      overlays = [ cargo2nix.overlays.default ];
+    };
+    packageFun = import ./Cargo.nix;
+    rustVersion = "1.77.2";
+
+    compile = args: compileMode:
+      let
+        packageSet = pkgs.rustBuilder.makePackageSet ({
+          inherit packageFun rustVersion;
+          target = targetHost;
+        } // args);
+      in
+        packageSet.workspace.tricot {
+          inherit compileMode;
+        };
+  in
+  {
+    test.x86_64-linux.tricot = compile { release = false; } "test";
+    debug.x86_64-linux.tricot = compile { release = false; } "build";
+    packages.x86_64-linux.tricot = compile { release = true; } "build";
+    packages.x86_64-linux.default = self.packages.x86_64-linux.tricot;
+
+    docker = pkgs.dockerTools.buildImage {
+      name = "tricot";
+      config = {
+        contents = [ pkgs.cacert ];
+        Cmd = [ "${self.packages.x86_64-linux.default}/bin/tricot" ];
+      };
+    };
+  };
+}

src/cert.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use anyhow::Result;
 
-use chrono::{Date, NaiveDate, Utc};
+use chrono::{NaiveDate, Utc};
 use rustls::sign::CertifiedKey;
 use serde::{Deserialize, Serialize};
 
@@ -54,8 +54,7 @@ impl Cert {
 	}
 
 	pub fn is_old(&self) -> bool {
-		let date = Date::<Utc>::from_utc(self.ser.date, Utc);
+		let today = Utc::now().date_naive();
-		let today = Utc::today();
+		today - self.ser.date > chrono::Duration::days(self.ser.valid_days / 2)
-		today - date > chrono::Duration::days(self.ser.valid_days / 2)
 	}
 }

src/cert_store.rs

@@ -5,31 +5,40 @@ use std::time::{Duration, Instant};
 use anyhow::Result;
 use chrono::Utc;
 use futures::{FutureExt, TryFutureExt};
-use log::*;
 use tokio::select;
 use tokio::sync::{mpsc, watch};
 use tokio::task::block_in_place;
+use tracing::*;
 
 use acme_micro::create_p384_key;
 use acme_micro::{Directory, DirectoryUrl};
 use rustls::sign::CertifiedKey;
 
 use crate::cert::{Cert, CertSer};
-use crate::consul::*;
+use crate::consul::{self, Consul};
 use crate::proxy_config::*;
 
 pub struct CertStore {
 	consul: Consul,
+	node_name: String,
 	letsencrypt_email: String,
+
 	certs: RwLock<HashMap<String, Arc<Cert>>>,
 	self_signed_certs: RwLock<HashMap<String, Arc<Cert>>>,
+
 	rx_proxy_config: watch::Receiver<Arc<ProxyConfig>>,
 	tx_need_cert: mpsc::UnboundedSender<String>,
 }
 
+struct ProcessedDomains {
+	static_domains: HashSet<String>,
+	on_demand_domains: Vec<(glob::Pattern, Option<String>)>,
+}
+
 impl CertStore {
 	pub fn new(
 		consul: Consul,
+		node_name: String,
 		rx_proxy_config: watch::Receiver<Arc<ProxyConfig>>,
 		letsencrypt_email: String,
 		exit_on_err: impl Fn(anyhow::Error) + Send + 'static,
@@ -38,10 +47,11 @@ impl CertStore {
 
 		let cert_store = Arc::new(Self {
 			consul,
+			node_name,
+			letsencrypt_email,
 			certs: RwLock::new(HashMap::new()),
 			self_signed_certs: RwLock::new(HashMap::new()),
 			rx_proxy_config,
-			letsencrypt_email,
 			tx_need_cert: tx,
 		});
 
@@ -63,46 +73,72 @@ impl CertStore {
 		let mut rx_proxy_config = self.rx_proxy_config.clone();
 
 		let mut t_last_check: HashMap<String, Instant> = HashMap::new();
+		let mut proc_domains: Option<ProcessedDomains> = None;
 
 		loop {
-			let mut domains: HashSet<String> = HashSet::new();
+			let domains = select! {
-
+				// Refresh some internal states, schedule static_domains for renew
-			select! {
 				res = rx_proxy_config.changed() => {
 					if res.is_err() {
 						bail!("rx_proxy_config closed");
 					}
 
+					let mut static_domains: HashSet<String> = HashSet::new();
+					let mut on_demand_domains: Vec<(glob::Pattern, Option<String>)> = vec![];
+
 					let proxy_config: Arc<ProxyConfig> = rx_proxy_config.borrow().clone();
+
 					for ent in proxy_config.entries.iter() {
-						if let HostDescription::Hostname(domain) = &ent.host {
+						// Eagerly generate certificates for domains that
+						// are not patterns
+						match &ent.url_prefix.host {
+							HostDescription::Hostname(domain) => {
 								if let Some((host, _port)) = domain.split_once(':') {
-								domains.insert(host.to_string());
+									static_domains.insert(host.to_string());
 								} else {
-								domains.insert(domain.clone());
+									static_domains.insert(domain.clone());
 								}
-						}
+							},
-					}
+							HostDescription::Pattern(pattern) => {
-				}
+								on_demand_domains.push((pattern.clone(), ent.on_demand_tls_ask.clone()));
-				need_cert = rx_need_cert.recv() => {
+							},
-					match need_cert {
-						Some(dom) => {
-							domains.insert(dom);
-							while let Ok(dom2) = rx_need_cert.try_recv() {
-								domains.insert(dom2);
-							}
-						}
-						None => bail!("rx_need_cert closed"),
-					};
 						}
 					}
 
+					// only static_domains are refreshed
+					proc_domains = Some(ProcessedDomains { static_domains: static_domains.clone(), on_demand_domains });
+					self.domain_validation(static_domains, proc_domains.as_ref()).await
+				}
+				// renew static and on-demand domains
+				need_cert = rx_need_cert.recv() => {
+					match need_cert {
+						Some(dom) => {
+							let mut candidates: HashSet<String> = HashSet::new();
+
+							// collect certificates as much as possible
+							candidates.insert(dom);
+							while let Ok(dom2) = rx_need_cert.try_recv() {
+								candidates.insert(dom2);
+							}
+
+							self.domain_validation(candidates, proc_domains.as_ref()).await
+						}
+						None => bail!("rx_need_cert closed"),
+					}
+				}
+			};
+
+			// Now that we have our list of domains to check,
+			// actually do something
 			for dom in domains.iter() {
+				// Exclude from the list domains that were checked less than 60
+				// seconds ago
 				match t_last_check.get(dom) {
 					Some(t) if Instant::now() - *t < Duration::from_secs(60) => continue,
 					_ => t_last_check.insert(dom.to_string(), Instant::now()),
 				};
 
+				// Actual Let's Encrypt calls are done here (in sister function)
 				debug!("Checking cert for domain: {}", dom);
 				if let Err(e) = self.check_cert(dom).await {
 					warn!("({}) Could not get certificate: {}", dom, e);
@@ -111,18 +147,82 @@ impl CertStore {
 		}
 	}
 
-	fn get_cert_for_https(self: &Arc<Self>, domain: &str) -> Result<Arc<Cert>> {
+	async fn domain_validation(
-		// Check if domain is authorized
+		&self,
-		if !self
+		candidates: HashSet<String>,
-			.rx_proxy_config
+		maybe_proc_domains: Option<&ProcessedDomains>,
-			.borrow()
+	) -> HashSet<String> {
-			.entries
+		let mut domains: HashSet<String> = HashSet::new();
-			.iter()
+
-			.any(|ent| ent.host.matches(domain))
+		// Handle initialization
-		{
+		let proc_domains = match maybe_proc_domains {
-			bail!("Domain {} should not have a TLS certificate.", domain);
+			None => {
+				warn!("Proxy config is not yet loaded, refusing all certificate generation");
+				return domains;
+			}
+			Some(proc) => proc,
+		};
+
+		// Filter certificates...
+		'outer: for candidate in candidates.into_iter() {
+			// Disallow obvious wrong domains...
+			if !candidate.contains('.') || candidate.ends_with(".local") {
+				warn!("{} is probably not a publicly accessible domain, skipping (a self-signed certificate will be used)", candidate);
+				continue;
 			}
 
+			// Try to register domain as a static domain
+			if proc_domains.static_domains.contains(&candidate) {
+				trace!("domain {} validated as static domain", candidate);
+				domains.insert(candidate);
+				continue;
+			}
+
+			// It's not a static domain, maybe an on-demand domain?
+			for (pattern, maybe_check_url) in proc_domains.on_demand_domains.iter() {
+				// check glob pattern
+				if pattern.matches(&candidate) {
+					// if no check url is set, accept domain as long as it matches the pattern
+					let check_url = match maybe_check_url {
+						None => {
+							trace!(
+								"domain {} validated on glob pattern {} only",
+								candidate,
+								pattern
+							);
+							domains.insert(candidate);
+							continue 'outer;
+						}
+						Some(url) => url,
+					};
+
+					// if a check url is set, call it
+					// -- avoid DDoSing a backend
+					tokio::time::sleep(Duration::from_secs(2)).await;
+					match self.on_demand_tls_ask(check_url, &candidate).await {
+						Ok(()) => {
+							trace!(
+								"domain {} validated on glob pattern {} and on check url {}",
+								candidate,
+								pattern,
+								check_url
+							);
+							domains.insert(candidate);
+							continue 'outer;
+						}
+						Err(e) => {
+							warn!("domain {} validation refused  on glob pattern {} and on check url {} with error: {}", candidate, pattern, check_url, e);
+						}
+					}
+				}
+			}
+		}
+
+		return domains;
+	}
+
+	/// This function is also in charge of the refresh of the domain names
+	fn get_cert_for_https(self: &Arc<Self>, domain: &str) -> Result<Arc<Cert>> {
 		// Check in local memory if it exists
 		if let Some(cert) = self.certs.read().unwrap().get(domain) {
 			if cert.is_old() {
@@ -142,6 +242,57 @@ impl CertStore {
 		self.gen_self_signed_certificate(domain)
 	}
 
+	pub async fn warmup_memory_store(self: &Arc<Self>) -> Result<()> {
+		let consul_certs = self
+			.consul
+			.kv_get_prefix("certs/", None)
+			.await?
+			.into_inner();
+
+		trace!(
+			"Fetched {} certificate entries from Consul",
+			consul_certs.len()
+		);
+		let mut loaded_certs: usize = 0;
+		for (key, cert) in consul_certs {
+			let certser: CertSer = match serde_json::from_slice(&cert) {
+				Ok(cs) => cs,
+				Err(e) => {
+					warn!("Could not deserialize CertSer for {key}: {e}");
+					continue;
+				}
+			};
+			let domain = certser.hostname.clone();
+
+			let cert = match Cert::new(certser) {
+				Ok(c) => c,
+				Err(e) => {
+					warn!("Could not create Cert from CertSer for domain {domain}: {e}");
+					continue;
+				}
+			};
+
+			self.certs
+				.write()
+				.unwrap()
+				.insert(domain.to_string(), Arc::new(cert));
+
+			debug!("({domain}) Certificate loaded from Consul to the Memory Store");
+			loaded_certs += 1;
+		}
+		info!("Memory store warmed up with {loaded_certs} certificates");
+		Ok(())
+	}
+
+	/// Check certificate ensure that the certificate is in the memory store
+	/// and that it does not need to be renewed.
+	///
+	/// If it's not in the memory store, it tries to load it from Consul,
+	/// if it's not in Consul, it calls Let's Encrypt.
+	///
+	/// If the certificate is outdated in the memory store, it tries to load
+	/// a more recent version in Consul, if the Consul version is also outdated,
+	/// it tries to renew it
 	pub async fn check_cert(self: &Arc<Self>, domain: &str) -> Result<()> {
 		// First, try locally.
 		{
@@ -159,41 +310,43 @@ impl CertStore {
 			.kv_get_json::<CertSer>(&format!("certs/{}", domain))
 			.await?
 		{
-			if let Ok(cert) = Cert::new(consul_cert) {
+			match Cert::new(consul_cert) {
+				Ok(cert) => {
 					let cert = Arc::new(cert);
 					self.certs
 						.write()
 						.unwrap()
 						.insert(domain.to_string(), cert.clone());
+					debug!("({domain}) Certificate loaded from Consul to the Memory Store");
+
 					if !cert.is_old() {
 						return Ok(());
 					}
 				}
+				Err(e) => {
+					warn!("Could not create Cert from CertSer for domain {domain}: {e}");
+				}
+			};
 		}
 
 		// Third, ask from Let's Encrypt
 		self.renew_cert(domain).await
 	}
 
+	/// This is the place where certificates are generated or renewed
 	pub async fn renew_cert(self: &Arc<Self>, domain: &str) -> Result<()> {
 		info!("({}) Renewing certificate", domain);
 
-		// Basic sanity check (we could add more kinds of checks here)
-		// This is just to help avoid getting rate-limited against ACME server
-		if !domain.contains('.') || domain.ends_with(".local") {
-			bail!("Probably not a publicly accessible domain, skipping (a self-signed certificate will be used)");
-		}
-
 		// ---- Acquire lock ----
 		// the lock is acquired for half an hour,
 		// so that in case of an error we won't retry before
 		// that delay expires
 
 		let lock_path = format!("renew_lock/{}", domain);
-		let lock_name = format!("tricot/renew:{}@{}", domain, self.consul.local_node.clone());
+		let lock_name = format!("tricot/renew:{}@{}", domain, self.node_name);
 		let session = self
 			.consul
-			.create_session(&ConsulSessionRequest {
+			.create_session(&consul::locking::SessionRequest {
 				name: lock_name.clone(),
 				node: None,
 				lock_delay: Some("30m".into()),
@@ -278,7 +431,7 @@ impl CertStore {
 
 		let certser = CertSer {
 			hostname: domain.to_string(),
-			date: Utc::today().naive_utc(),
+			date: Utc::now().date_naive(),
 			valid_days: cert.valid_days_left()?,
 			key_pem,
 			cert_pem,
@@ -299,6 +452,19 @@ impl CertStore {
 		Ok(())
 	}
 
+	async fn on_demand_tls_ask(&self, check_url: &str, domain: &str) -> Result<()> {
+		let httpcli = reqwest::Client::new();
+		let chall_url = format!("{}?domain={}", check_url, domain);
+		info!("({}) On-demand TLS check", domain);
+
+		let httpresp = httpcli.get(&chall_url).send().await?;
+		if httpresp.status() != reqwest::StatusCode::OK {
+			bail!("{} is not authorized for on-demand TLS", domain);
+		}
+
+		Ok(())
+	}
+
 	async fn check_domain_accessibility(&self, domain: &str, session: &str) -> Result<()> {
 		// Returns Ok(()) only if domain is a correct domain name that
 		// redirects to this server
@@ -345,7 +511,7 @@ impl CertStore {
 
 		let certser = CertSer {
 			hostname: domain.to_string(),
-			date: Utc::today().naive_utc(),
+			date: Utc::now().date_naive(),
 			valid_days: 1024,
 			key_pem: cert.serialize_private_key_pem(),
 			cert_pem: cert.serialize_pem()?,

src/consul.rs

@@ -1,245 +0,0 @@
-use std::collections::HashMap;
-use std::fs::File;
-use std::io::Read;
-
-use anyhow::{bail, Result};
-use bytes::Bytes;
-use log::*;
-use reqwest::StatusCode;
-use serde::{Deserialize, Serialize};
-
-pub struct ConsulConfig {
-	pub addr: String,
-	pub ca_cert: Option<String>,
-	pub client_cert: Option<String>,
-	pub client_key: Option<String>,
-}
-
-// ---- Watch and retrieve Consul catalog ----
-//
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ConsulNode {
-	#[serde(rename = "Node")]
-	pub node: String,
-	#[serde(rename = "Address")]
-	pub address: String,
-	#[serde(rename = "Meta")]
-	pub meta: HashMap<String, String>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ConsulServiceEntry {
-	#[serde(rename = "Service")]
-	pub service: String,
-
-	#[serde(rename = "Address")]
-	pub address: String,
-
-	#[serde(rename = "Port")]
-	pub port: u16,
-
-	#[serde(rename = "Tags")]
-	pub tags: Vec<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ConsulNodeCatalog {
-	#[serde(rename = "Node")]
-	pub node: ConsulNode,
-	#[serde(rename = "Services")]
-	pub services: HashMap<String, ConsulServiceEntry>,
-}
-
-// ---- Consul session management ----
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ConsulSessionRequest {
-	#[serde(rename = "Name")]
-	pub name: String,
-
-	#[serde(rename = "Node")]
-	pub node: Option<String>,
-
-	#[serde(rename = "LockDelay")]
-	pub lock_delay: Option<String>,
-
-	#[serde(rename = "TTL")]
-	pub ttl: Option<String>,
-
-	#[serde(rename = "Behavior")]
-	pub behavior: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ConsulSessionResponse {
-	#[serde(rename = "ID")]
-	pub id: String,
-}
-
-#[derive(Clone)]
-pub struct Consul {
-	client: reqwest::Client,
-
-	url: String,
-	kv_prefix: String,
-
-	pub local_node: String,
-}
-
-impl Consul {
-	pub fn new(config: ConsulConfig, kv_prefix: &str, local_node: &str) -> Result<Self> {
-		let client = match (&config.ca_cert, &config.client_cert, &config.client_key) {
-			(Some(ca_cert), Some(client_cert), Some(client_key)) => {
-				let mut ca_cert_buf = vec![];
-				File::open(ca_cert)?.read_to_end(&mut ca_cert_buf)?;
-
-				let mut client_cert_buf = vec![];
-				File::open(client_cert)?.read_to_end(&mut client_cert_buf)?;
-
-				let mut client_key_buf = vec![];
-				File::open(client_key)?.read_to_end(&mut client_key_buf)?;
-
-				reqwest::Client::builder()
-					.use_rustls_tls()
-					.add_root_certificate(reqwest::Certificate::from_pem(&ca_cert_buf[..])?)
-					.identity(reqwest::Identity::from_pem(
-						&[&client_cert_buf[..], &client_key_buf[..]].concat()[..],
-					)?)
-					.build()?
-			}
-			(None, None, None) => reqwest::Client::new(),
-			_ => bail!("Incomplete Consul TLS configuration parameters"),
-		};
-
-		Ok(Self {
-			client,
-			url: config.addr.trim_end_matches('/').to_string(),
-			kv_prefix: kv_prefix.to_string(),
-			local_node: local_node.into(),
-		})
-	}
-
-	pub async fn list_nodes(&self) -> Result<Vec<ConsulNode>> {
-		debug!("list_nodes");
-
-		let url = format!("{}/v1/catalog/nodes", self.url);
-
-		let http = self.client.get(&url).send().await?;
-		let resp: Vec<ConsulNode> = http.json().await?;
-		Ok(resp)
-	}
-
-	pub async fn watch_node(
-		&self,
-		host: &str,
-		idx: Option<usize>,
-	) -> Result<(ConsulNodeCatalog, usize)> {
-		debug!("watch_node {} {:?}", host, idx);
-
-		let url = match idx {
-			Some(i) => format!("{}/v1/catalog/node/{}?index={}", self.url, host, i),
-			None => format!("{}/v1/catalog/node/{}", self.url, host),
-		};
-
-		let http = self.client.get(&url).send().await?;
-		let new_idx = match http.headers().get("X-Consul-Index") {
-			Some(v) => v.to_str()?.parse::<usize>()?,
-			None => bail!("X-Consul-Index header not found"),
-		};
-
-		let resp: ConsulNodeCatalog = http.json().await?;
-		Ok((resp, new_idx))
-	}
-
-	// ---- KV get and put ----
-
-	pub async fn kv_get(&self, key: &str) -> Result<Option<Bytes>> {
-		debug!("kv_get {}", key);
-
-		let url = format!("{}/v1/kv/{}{}?raw", self.url, self.kv_prefix, key);
-		let http = self.client.get(&url).send().await?;
-		match http.status() {
-			StatusCode::OK => Ok(Some(http.bytes().await?)),
-			StatusCode::NOT_FOUND => Ok(None),
-			_ => Err(anyhow!(
-				"Consul request failed: {:?}",
-				http.error_for_status()
-			)),
-		}
-	}
-
-	pub async fn kv_get_json<T: for<'de> Deserialize<'de>>(&self, key: &str) -> Result<Option<T>> {
-		debug!("kv_get_json {}", key);
-
-		let url = format!("{}/v1/kv/{}{}?raw", self.url, self.kv_prefix, key);
-		let http = self.client.get(&url).send().await?;
-		match http.status() {
-			StatusCode::OK => Ok(Some(http.json().await?)),
-			StatusCode::NOT_FOUND => Ok(None),
-			_ => Err(anyhow!(
-				"Consul request failed: {:?}",
-				http.error_for_status()
-			)),
-		}
-	}
-
-	pub async fn kv_put(&self, key: &str, bytes: Bytes) -> Result<()> {
-		debug!("kv_put {}", key);
-
-		let url = format!("{}/v1/kv/{}{}", self.url, self.kv_prefix, key);
-		let http = self.client.put(&url).body(bytes).send().await?;
-		http.error_for_status()?;
-		Ok(())
-	}
-
-	pub async fn kv_put_json<T: Serialize>(&self, key: &str, value: &T) -> Result<()> {
-		debug!("kv_put_json {}", key);
-
-		let url = format!("{}/v1/kv/{}{}", self.url, self.kv_prefix, key);
-		let http = self.client.put(&url).json(value).send().await?;
-		http.error_for_status()?;
-		Ok(())
-	}
-
-	pub async fn kv_delete(&self, key: &str) -> Result<()> {
-		let url = format!("{}/v1/kv/{}{}", self.url, self.kv_prefix, key);
-		let http = self.client.delete(&url).send().await?;
-		http.error_for_status()?;
-		Ok(())
-	}
-
-	// ---- Locking ----
-
-	pub async fn create_session(&self, req: &ConsulSessionRequest) -> Result<String> {
-		debug!("create_session {:?}", req);
-
-		let url = format!("{}/v1/session/create", self.url);
-		let http = self.client.put(&url).json(req).send().await?;
-		let resp: ConsulSessionResponse = http.json().await?;
-		Ok(resp.id)
-	}
-
-	pub async fn acquire(&self, key: &str, bytes: Bytes, session: &str) -> Result<bool> {
-		debug!("acquire {}", key);
-
-		let url = format!(
-			"{}/v1/kv/{}{}?acquire={}",
-			self.url, self.kv_prefix, key, session
-		);
-		let http = self.client.put(&url).body(bytes).send().await?;
-		let resp: bool = http.json().await?;
-		Ok(resp)
-	}
-
-	pub async fn release(&self, key: &str, bytes: Bytes, session: &str) -> Result<()> {
-		debug!("release {}", key);
-
-		let url = format!(
-			"{}/v1/kv/{}{}?release={}",
-			self.url, self.kv_prefix, key, session
-		);
-		let http = self.client.put(&url).body(bytes).send().await?;
-		http.error_for_status()?;
-		Ok(())
-	}
-}

src/http.rs

@@ -2,7 +2,7 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 
 use anyhow::Result;
-use log::*;
+use tracing::*;
 
 use futures::future::Future;
 use http::uri::Authority;

src/https.rs

@@ -1,10 +1,10 @@
 use std::convert::Infallible;
 use std::net::SocketAddr;
 use std::sync::{atomic::Ordering, Arc};
-use std::time::Duration;
+use std::time::{Duration, Instant};
 
 use anyhow::Result;
-use log::*;
+use tracing::*;
 
 use accept_encoding_fork::Encoding;
 use async_compression::tokio::bufread::*;
@@ -21,8 +21,10 @@ use tokio::sync::watch;
 use tokio_rustls::TlsAcceptor;
 use tokio_util::io::{ReaderStream, StreamReader};
 
+use opentelemetry::{metrics, KeyValue};
+
 use crate::cert_store::{CertStore, StoreResolver};
-use crate::proxy_config::ProxyConfig;
+use crate::proxy_config::{HostDescription, ProxyConfig, ProxyEntry};
 use crate::reverse_proxy;
 
 const MAX_CONNECTION_LIFETIME: Duration = Duration::from_secs(24 * 3600);
@@ -31,6 +33,15 @@ pub struct HttpsConfig {
 	pub bind_addr: SocketAddr,
 	pub enable_compression: bool,
 	pub compress_mime_types: Vec<String>,
+
+	// used internally to convert Instants to u64
+	pub time_origin: Instant,
+}
+
+struct HttpsMetrics {
+	requests_received: metrics::Counter<u64>,
+	requests_served: metrics::Counter<u64>,
+	request_proxy_duration: metrics::Histogram<f64>,
 }
 
 pub async fn serve_https(
@@ -41,6 +52,22 @@ pub async fn serve_https(
 ) -> Result<()> {
 	let config = Arc::new(config);
 
+	let meter = opentelemetry::global::meter("tricot");
+	let metrics = Arc::new(HttpsMetrics {
+		requests_received: meter
+			.u64_counter("https_requests_received")
+			.with_description("Total number of requests received over HTTPS")
+			.init(),
+		requests_served: meter
+			.u64_counter("https_requests_served")
+			.with_description("Total number of requests served over HTTPS")
+			.init(),
+		request_proxy_duration: meter
+			.f64_histogram("https_request_proxy_duration")
+			.with_description("Duration between time when request was received, and time when backend returned status code and headers")
+			.init(),
+	});
+
 	let mut tls_cfg = rustls::ServerConfig::builder()
 		.with_safe_defaults()
 		.with_no_client_auth()
@@ -71,20 +98,31 @@ pub async fn serve_https(
 		let rx_proxy_config = rx_proxy_config.clone();
 		let tls_acceptor = tls_acceptor.clone();
 		let config = config.clone();
+		let metrics = metrics.clone();
 
 		let mut must_exit_2 = must_exit.clone();
 		let conn = tokio::spawn(async move {
 			match tls_acceptor.accept(socket).await {
 				Ok(stream) => {
 					debug!("TLS handshake was successfull");
-					let http_conn = Http::new().serve_connection(
+					let http_conn = Http::new()
+						.serve_connection(
 							stream,
 							service_fn(move |req: Request<Body>| {
 								let https_config = config.clone();
-							let proxy_config: Arc<ProxyConfig> = rx_proxy_config.borrow().clone();
+								let proxy_config: Arc<ProxyConfig> =
-							handle_outer(remote_addr, req, https_config, proxy_config)
+									rx_proxy_config.borrow().clone();
+								let metrics = metrics.clone();
+								handle_request(
+									remote_addr,
+									req,
+									https_config,
+									proxy_config,
+									metrics,
+								)
 							}),
-					);
+						)
+						.with_upgrades();
 					let timeout = tokio::time::sleep(MAX_CONNECTION_LIFETIME);
 					tokio::pin!(http_conn, timeout);
 					let http_result = loop {
@@ -116,52 +154,89 @@ pub async fn serve_https(
 	Ok(())
 }
 
-async fn handle_outer(
+async fn handle_request(
 	remote_addr: SocketAddr,
 	req: Request<Body>,
 	https_config: Arc<HttpsConfig>,
 	proxy_config: Arc<ProxyConfig>,
+	metrics: Arc<HttpsMetrics>,
 ) -> Result<Response<Body>, Infallible> {
-	match handle(remote_addr, req, https_config, proxy_config).await {
+	let method_tag = KeyValue::new("method", req.method().to_string());
-		Err(e) => {
+
-			warn!("Handler error: {}", e);
+	// The host tag is only included in the requests_received metric,
-			Ok(Response::builder()
+	// as for other metrics it can easily lead to cardinality explosions.
-				.status(StatusCode::INTERNAL_SERVER_ERROR)
+	let host_tag = KeyValue::new(
-				.body(Body::from(format!("{}", e)))
+		"host",
-				.unwrap())
+		req.uri()
-		}
+			.authority()
-		Ok(r) => Ok(r),
+			.map(|auth| auth.to_string())
-	}
+			.or_else(|| {
+				req.headers()
+					.get("host")
+					.map(|host| host.to_str().unwrap_or_default().to_string())
+			})
+			.unwrap_or_default(),
+	);
+
+	metrics
+		.requests_received
+		.add(1, &[host_tag, method_tag.clone()]);
+
+	let mut tags = vec![method_tag];
+	let resp = select_target_and_proxy(
+		&https_config,
+		&proxy_config,
+		&metrics,
+		remote_addr,
+		req,
+		&mut tags,
+	)
+	.await;
+
+	tags.push(KeyValue::new("status_code", resp.status().as_u16() as i64));
+	metrics.requests_served.add(1, &tags);
+
+	Ok(resp)
 }
 
 // Custom echo service, handling two different routes and a
 // catch-all 404 responder.
-async fn handle(
+async fn select_target_and_proxy(
+	https_config: &HttpsConfig,
+	proxy_config: &ProxyConfig,
+	metrics: &HttpsMetrics,
 	remote_addr: SocketAddr,
 	req: Request<Body>,
-	https_config: Arc<HttpsConfig>,
+	tags: &mut Vec<KeyValue>,
-	proxy_config: Arc<ProxyConfig>,
+) -> Response<Body> {
-) -> Result<Response<Body>, anyhow::Error> {
+	let received_time = Instant::now();
+
 	let method = req.method().clone();
 	let uri = req.uri().to_string();
 
 	let host = if let Some(auth) = req.uri().authority() {
 		auth.as_str()
 	} else {
-		req.headers()
+		match req.headers().get("host").and_then(|x| x.to_str().ok()) {
-			.get("host")
+			Some(host) => host,
-			.ok_or_else(|| anyhow!("Missing host header"))?
+			None => {
-			.to_str()?
+				return Response::builder()
+					.status(StatusCode::BAD_REQUEST)
+					.body(Body::from("Missing Host header"))
+					.unwrap();
+			}
+		}
 	};
 	let path = req.uri().path();
-	let accept_encoding = accept_encoding_fork::encodings(req.headers()).unwrap_or_else(|_| vec![]);
 
 	let best_match = proxy_config
 		.entries
 		.iter()
 		.filter(|ent| {
-			ent.host.matches(host)
+			ent.flags.healthy
+				&& ent.url_prefix.host.matches(host)
 				&& ent
+					.url_prefix
 					.path_prefix
 					.as_ref()
 					.map(|prefix| path.starts_with(prefix))
@@ -170,67 +245,147 @@ async fn handle(
 		.max_by_key(|ent| {
 			(
 				ent.priority,
-				ent.path_prefix
+				ent.url_prefix
+					.path_prefix
 					.as_ref()
 					.map(|x| x.len() as i32)
 					.unwrap_or(0),
-				ent.same_node,
+				(ent.flags.same_node || ent.flags.site_lb || ent.flags.global_lb),
-				ent.same_site,
+				(ent.flags.same_site || ent.flags.global_lb),
-				-ent.calls.load(Ordering::SeqCst),
+				-ent.calls_in_progress.load(Ordering::SeqCst),
+				-ent.last_call.load(Ordering::SeqCst),
 			)
 		});
 
 	if let Some(proxy_to) = best_match {
-		proxy_to.calls.fetch_add(1, Ordering::SeqCst);
+		tags.push(KeyValue::new("service", proxy_to.service_name.clone()));
+		tags.push(KeyValue::new(
+			"target_addr",
+			proxy_to.target_addr.to_string(),
+		));
+		tags.push(KeyValue::new("same_node", proxy_to.flags.same_node));
+		tags.push(KeyValue::new("same_site", proxy_to.flags.same_site));
 
+		proxy_to.last_call.fetch_max(
+			(received_time - https_config.time_origin).as_millis() as i64,
+			Ordering::Relaxed,
+		);
+		proxy_to.calls_in_progress.fetch_add(1, Ordering::SeqCst);
+
+		// Forward to backend
 		debug!("{}{} -> {}", host, path, proxy_to);
 		trace!("Request: {:?}", req);
 
-		let mut response = if proxy_to.https_target {
+		let response = if let Some(http_res) = try_redirect(host, path, proxy_to) {
-			let to_addr = format!("https://{}", proxy_to.target_addr);
+			// redirection middleware
-			handle_error(reverse_proxy::call_https(remote_addr.ip(), &to_addr, req).await)
+			http_res
 		} else {
-			let to_addr = format!("http://{}", proxy_to.target_addr);
+			// proxying to backend
-			handle_error(reverse_proxy::call(remote_addr.ip(), &to_addr, req).await)
+			match do_proxy(https_config, remote_addr, req, proxy_to).await {
-		};
-
-		// Do further processing (compression, additionnal headers) only for 2xx responses
-		if !response.status().is_success() {
-			return Ok(response);
-		}
-
-		for (header, value) in proxy_to.add_headers.iter() {
-			response.headers_mut().insert(
-				HeaderName::from_bytes(header.as_bytes())?,
-				HeaderValue::from_str(value)?,
-			);
-		}
-		trace!("Response: {:?}", response);
-		info!("{} {} {}", method, response.status().as_u16(), uri);
-
-		if https_config.enable_compression {
-			try_compress(response, method, accept_encoding, &https_config).await
-		} else {
-			Ok(response)
-		}
-	} else {
-		debug!("{}{} -> NOT FOUND", host, path);
-		info!("{} 404 {}", method, uri);
-
-		Ok(Response::builder()
-			.status(StatusCode::NOT_FOUND)
-			.body(Body::from("No matching proxy entry"))?)
-	}
-}
-
-fn handle_error(resp: Result<Response<Body>>) -> Response<Body> {
-	match resp {
 				Ok(resp) => resp,
 				Err(e) => Response::builder()
 					.status(StatusCode::BAD_GATEWAY)
 					.body(Body::from(format!("Proxy error: {}", e)))
 					.unwrap(),
 			}
+		};
+
+		proxy_to.calls_in_progress.fetch_sub(1, Ordering::SeqCst);
+		metrics
+			.request_proxy_duration
+			.record(received_time.elapsed().as_secs_f64(), tags);
+
+		trace!("Final response: {:?}", response);
+		info!("{} {} {}", method, response.status().as_u16(), uri);
+		response
+	} else {
+		debug!("{}{} -> NOT FOUND", host, path);
+		info!("{} 404 {}", method, uri);
+
+		Response::builder()
+			.status(StatusCode::NOT_FOUND)
+			.body(Body::from("No matching proxy entry"))
+			.unwrap()
+	}
+}
+
+fn try_redirect(req_host: &str, req_path: &str, proxy_to: &ProxyEntry) -> Option<Response<Body>> {
+	let maybe_redirect = proxy_to.redirects.iter().find(|(src, _, _)| {
+		let mut matched: bool = src.host.matches(req_host);
+
+		if let Some(path) = &src.path_prefix {
+			matched &= req_path.starts_with(path);
+		}
+
+		matched
+	});
+
+	let (src_prefix, dst_prefix, code) = match maybe_redirect {
+		None => return None,
+		Some(redirect) => redirect,
+	};
+
+	let new_host = match &dst_prefix.host {
+		HostDescription::Hostname(h) => h,
+		_ => unreachable!(), // checked when ProxyEntry is created
+	};
+
+	let new_prefix = dst_prefix.path_prefix.as_deref().unwrap_or("");
+	let original_prefix = src_prefix.path_prefix.as_deref().unwrap_or("");
+	let suffix = &req_path[original_prefix.len()..];
+
+	let uri = format!("https://{}{}{}", new_host, new_prefix, suffix);
+
+	let status = match StatusCode::from_u16(*code) {
+		Err(e) => {
+			warn!(
+				"Couldn't redirect {}{} to {} as code {} in invalid: {}",
+				req_host, req_path, uri, code, e
+			);
+			return None;
+		}
+		Ok(sc) => sc,
+	};
+
+	Response::builder()
+		.header("Location", uri.clone())
+		.status(status)
+		.body(Body::from(uri))
+		.ok()
+}
+
+async fn do_proxy(
+	https_config: &HttpsConfig,
+	remote_addr: SocketAddr,
+	req: Request<Body>,
+	proxy_to: &ProxyEntry,
+) -> Result<Response<Body>> {
+	let method = req.method().clone();
+	let accept_encoding = accept_encoding_fork::encodings(req.headers()).unwrap_or_else(|_| vec![]);
+
+	let mut response = if proxy_to.https_target {
+		let to_addr = format!("https://{}", proxy_to.target_addr);
+		reverse_proxy::call_https(remote_addr.ip(), &to_addr, req).await?
+	} else {
+		let to_addr = format!("http://{}", proxy_to.target_addr);
+		reverse_proxy::call(remote_addr.ip(), &to_addr, req).await?
+	};
+
+	if response.status().is_success() || response.status().is_redirection() {
+		// (TODO: maybe we want to add these headers even if it's not a success or redirection?)
+		for (header, value) in proxy_to.add_headers.iter() {
+			response.headers_mut().insert(
+				HeaderName::from_bytes(header.as_bytes())?,
+				HeaderValue::from_str(value)?,
+			);
+		}
+	}
+
+	if https_config.enable_compression {
+		response = try_compress(response, method, accept_encoding, https_config).await?
+	};
+
+	Ok(response)
 }
 
 async fn try_compress(
@@ -240,10 +395,14 @@ async fn try_compress(
 	https_config: &HttpsConfig,
 ) -> Result<Response<Body>> {
 	// Don't bother compressing successfull responses for HEAD and PUT (they should have an empty body)
-	// Don't compress partial content, that would be wierd
+	// Don't compress partial content as it causes issues
-	// If already compressed, return as is
+	// Don't bother compressing non-2xx results
+	// Don't compress Upgrade responses (e.g. websockets)
+	// Don't compress responses that are already compressed
 	if (response.status().is_success() && (method == Method::HEAD || method == Method::PUT))
 		|| response.status() == StatusCode::PARTIAL_CONTENT
+		|| !response.status().is_success()
+		|| response.headers().get(header::CONNECTION) == Some(&HeaderValue::from_static("Upgrade"))
 		|| response.headers().get(header::CONTENT_ENCODING).is_some()
 	{
 		return Ok(response);

src/main.rs

@@ -1,8 +1,10 @@
 #[macro_use]
 extern crate anyhow;
 
-use log::*;
+use std::collections::BTreeMap;
 use std::sync::Arc;
+use std::time::Instant;
+use tracing::*;
 
 use futures::{FutureExt, TryFutureExt};
 use std::net::SocketAddr;
@@ -12,13 +14,14 @@ use tokio::sync::watch;
 
 mod cert;
 mod cert_store;
-mod consul;
 mod http;
 mod https;
+mod metrics;
 mod proxy_config;
 mod reverse_proxy;
 mod tls_util;
 
+pub use df_consul as consul;
 use proxy_config::ProxyConfig;
 
 #[cfg(feature = "dhat-heap")]
@@ -40,6 +43,10 @@ struct Opt {
 	#[structopt(long = "consul-ca-cert", env = "TRICOT_CONSUL_CA_CERT")]
 	pub consul_ca_cert: Option<String>,
 
+	/// Skip TLS verification for Consul
+	#[structopt(long = "consul-tls-skip-verify", env = "TRICOT_CONSUL_TLS_SKIP_VERIFY")]
+	pub consul_tls_skip_verify: bool,
+
 	/// Client certificate for Consul server with TLS
 	#[structopt(long = "consul-client-cert", env = "TRICOT_CONSUL_CLIENT_CERT")]
 	pub consul_client_cert: Option<String>,
@@ -76,6 +83,10 @@ struct Opt {
 	)]
 	pub https_bind_addr: SocketAddr,
 
+	/// Bind address for metrics server (Prometheus format over HTTP)
+	#[structopt(long = "metrics-bind-addr", env = "TRICOT_METRICS_BIND_ADDR")]
+	pub metrics_bind_addr: Option<SocketAddr>,
+
 	/// E-mail address for Let's Encrypt certificate requests
 	#[structopt(long = "letsencrypt-email", env = "TRICOT_LETSENCRYPT_EMAIL")]
 	pub letsencrypt_email: String,
@@ -91,6 +102,12 @@ struct Opt {
 		default_value = "text/html,text/plain,text/css,text/javascript,text/xml,application/javascript,application/json,application/xml,image/svg+xml,font/ttf"
 	)]
 	pub compress_mime_types: String,
+
+	#[structopt(
+		long = "warmup-cert-memory-store",
+		env = "TRICOT_WARMUP_CERT_MEMORY_STORE"
+	)]
+	pub warmup_cert_memory_store: bool,
 }
 
 #[tokio::main(flavor = "multi_thread", worker_threads = 10)]
@@ -101,7 +118,10 @@ async fn main() {
 	if std::env::var("RUST_LOG").is_err() {
 		std::env::set_var("RUST_LOG", "tricot=info")
 	}
-	pretty_env_logger::init();
+	tracing_subscriber::fmt()
+		.with_writer(std::io::stderr)
+		.with_env_filter(tracing_subscriber::filter::EnvFilter::from_default_env())
+		.init();
 
 	// Abort on panic (same behavior as in Go)
 	std::panic::set_hook(Box::new(|panic_info| {
@@ -112,6 +132,7 @@ async fn main() {
 	let opt = Opt::from_args();
 
 	info!("Starting Tricot");
+	println!("Starting Tricot");
 
 	let (exit_signal, provoke_exit) = watch_ctrl_c();
 	let exit_on_err = move |err: anyhow::Error| {
@@ -119,24 +140,44 @@ async fn main() {
 		let _ = provoke_exit.send(true);
 	};
 
-	let consul_config = consul::ConsulConfig {
+	let metrics_server = metrics::MetricsServer::init(opt.metrics_bind_addr);
+
+	let consul_config = consul::Config {
 		addr: opt.consul_addr.clone(),
 		ca_cert: opt.consul_ca_cert.clone(),
+		tls_skip_verify: opt.consul_tls_skip_verify,
 		client_cert: opt.consul_client_cert.clone(),
 		client_key: opt.consul_client_key.clone(),
 	};
 
-	let consul = consul::Consul::new(consul_config, &opt.consul_kv_prefix, &opt.node_name)
+	let consul = consul::Consul::new(consul_config, &opt.consul_kv_prefix)
 		.expect("Error creating Consul client");
-	let rx_proxy_config =
+	let rx_proxy_config = proxy_config::spawn_proxy_config_task(
-		proxy_config::spawn_proxy_config_task(consul.clone(), exit_signal.clone());
+		consul.clone(),
+		opt.node_name.clone(),
+		exit_signal.clone(),
+	);
 
 	let cert_store = cert_store::CertStore::new(
 		consul.clone(),
+		opt.node_name.clone(),
 		rx_proxy_config.clone(),
 		opt.letsencrypt_email.clone(),
 		exit_on_err.clone(),
 	);
+	if opt.warmup_cert_memory_store {
+		match cert_store.warmup_memory_store().await {
+            Err(e) => error!("An error occured while warming up the certificate memory store with Consul data, continue without caching: {e}"),
+            _ => (),
+        };
+	}
+
+	let metrics_task = tokio::spawn(
+		metrics_server
+			.run(wait_from(exit_signal.clone()))
+			.map_err(exit_on_err.clone())
+			.then(|_| async { info!("Metrics server exited") }),
+	);
 
 	let http_task = tokio::spawn(
 		http::serve_http(
@@ -156,6 +197,7 @@ async fn main() {
 			.split(',')
 			.map(|x| x.to_string())
 			.collect(),
+		time_origin: Instant::now(),
 	};
 
 	let https_task = tokio::spawn(
@@ -171,29 +213,58 @@ async fn main() {
 
 	let dump_task = tokio::spawn(dump_config_on_change(rx_proxy_config, exit_signal.clone()));
 
-	let _ = http_task.await.expect("Tokio task await failure");
+	metrics_task.await.expect("Tokio task await failure");
-	let _ = https_task.await.expect("Tokio task await failure");
+	http_task.await.expect("Tokio task await failure");
-	let _ = dump_task.await.expect("Tokio task await failure");
+	https_task.await.expect("Tokio task await failure");
+	dump_task.await.expect("Tokio task await failure");
 }
 
 async fn dump_config_on_change(
 	mut rx_proxy_config: watch::Receiver<Arc<ProxyConfig>>,
 	mut must_exit: watch::Receiver<bool>,
 ) {
+	let mut old_cfg: Arc<ProxyConfig> = rx_proxy_config.borrow().clone();
+
 	while !*must_exit.borrow() {
 		select!(
 			c = rx_proxy_config.changed() => {
-				if !c.is_ok() {
+				if c.is_err() {
 					break;
 				}
 			}
 			_ = must_exit.changed() => continue,
 		);
-		println!("---- PROXY CONFIGURATION ----");
+
-		for ent in rx_proxy_config.borrow().entries.iter() {
+		let cfg: Arc<ProxyConfig> = rx_proxy_config.borrow().clone();
-			println!("   {}", ent);
+		if cfg != old_cfg {
+			let mut cfg_map = BTreeMap::<_, Vec<_>>::new();
+			for ent in cfg.entries.iter() {
+				cfg_map
+					.entry((&ent.url_prefix.host, &ent.url_prefix.path_prefix))
+					.or_default()
+					.push(ent);
+			}
+
+			println!(
+				"---- PROXY CONFIGURATION at {} ----",
+				chrono::offset::Utc::now().to_rfc3339_opts(chrono::SecondsFormat::Secs, true)
+			);
+			for ((host, prefix), ents) in cfg_map.iter_mut() {
+				println!("{}{}:", host, prefix.as_deref().unwrap_or_default());
+				for ent in ents.iter() {
+					print!("    ");
+					if !ent.flags.healthy {
+						print!("/!\\ ");
+					} else {
+						print!("    ");
+					}
+					println!("{}", ent);
+				}
 			}
 			println!();
+
+			old_cfg = cfg;
+		}
 	}
 }
 

src/metrics.rs

@@ -0,0 +1,111 @@
+use std::convert::Infallible;
+use std::net::SocketAddr;
+use std::sync::Arc;
+
+use anyhow::Result;
+use futures::future::*;
+use tracing::*;
+
+use hyper::{
+	header::CONTENT_TYPE,
+	service::{make_service_fn, service_fn},
+	Body, Method, Request, Response, Server,
+};
+use opentelemetry::sdk::metrics;
+use prometheus::{Encoder, TextEncoder};
+
+pub struct MetricsServer {
+	bind_addr: Option<SocketAddr>,
+	registry: prometheus::Registry,
+}
+
+impl MetricsServer {
+	pub fn init(bind_addr: Option<SocketAddr>) -> MetricsServer {
+		let registry = prometheus::Registry::new();
+		let exporter = opentelemetry_prometheus::exporter()
+			.with_registry(registry.clone())
+			.with_aggregation_selector(AggregationSelector)
+			.without_counter_suffixes()
+			.build()
+			.expect("build prometheus registry");
+		let mp = metrics::MeterProvider::builder()
+			.with_reader(exporter)
+			.build();
+		opentelemetry::global::set_meter_provider(mp);
+		Self {
+			bind_addr,
+			registry,
+		}
+	}
+
+	pub async fn run(self, shutdown_signal: impl Future<Output = ()>) -> Result<()> {
+		if let Some(addr) = self.bind_addr {
+			let metrics_server = Arc::new(self);
+
+			let make_svc = make_service_fn(move |_conn| {
+				let metrics_server = metrics_server.clone();
+				async move {
+					Ok::<_, Infallible>(service_fn(move |req| {
+						metrics_server.clone().serve_req(req)
+					}))
+				}
+			});
+
+			let server = Server::bind(&addr).serve(make_svc);
+			let graceful = server.with_graceful_shutdown(shutdown_signal);
+			info!("Metrics server listening on http://{}", addr);
+
+			graceful.await?;
+		} else {
+			info!("Metrics server is disabled");
+		}
+
+		Ok(())
+	}
+
+	async fn serve_req(
+		self: Arc<MetricsServer>,
+		req: Request<Body>,
+	) -> Result<Response<Body>, hyper::Error> {
+		debug!("{} {}", req.method(), req.uri());
+
+		let response = match (req.method(), req.uri().path()) {
+			(&Method::GET, "/metrics") => {
+				let mut buffer = vec![];
+				let encoder = TextEncoder::new();
+				let metric_families = self.registry.gather();
+				encoder.encode(&metric_families, &mut buffer).unwrap();
+
+				Response::builder()
+					.status(200)
+					.header(CONTENT_TYPE, encoder.format_type())
+					.body(Body::from(buffer))
+					.unwrap()
+			}
+			_ => Response::builder()
+				.status(404)
+				.body(Body::from("Not implemented"))
+				.unwrap(),
+		};
+
+		Ok(response)
+	}
+}
+
+struct AggregationSelector;
+
+impl metrics::reader::AggregationSelector for AggregationSelector {
+	fn aggregation(&self, kind: metrics::InstrumentKind) -> metrics::Aggregation {
+		match kind {
+			metrics::InstrumentKind::Histogram => metrics::Aggregation::ExplicitBucketHistogram {
+				boundaries: vec![
+					0.001, 0.0015, 0.002, 0.003, 0.005, 0.007, 0.01, 0.015, 0.02, 0.03, 0.05, 0.07,
+					0.1, 0.15, 0.2, 0.3, 0.5, 0.7, 1., 1.5, 2., 3., 5., 7., 10., 15., 20., 30.,
+					40., 50., 60., 70., 100.,
+				],
+				record_min_max: true,
+			},
+			_ => metrics::reader::DefaultAggregationSelector::new().aggregation(kind),
+		}
+	}
+}

src/proxy_config.rs

@@ -1,21 +1,19 @@
 use std::collections::HashMap;
 use std::net::SocketAddr;
 use std::sync::{atomic, Arc};
-use std::{cmp, time::Duration};
+use std::time::Duration;
 
 use anyhow::Result;
+use opentelemetry::{metrics, KeyValue};
 
-use futures::future::BoxFuture;
+use tokio::{select, sync::watch};
-use futures::stream::{FuturesUnordered, StreamExt};
+use tracing::*;
 
-use log::*;
+use crate::consul;
-use tokio::{select, sync::watch, time::sleep};
-
-use crate::consul::*;
 
 // ---- Extract proxy config from Consul catalog ----
 
-#[derive(Debug)]
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
 pub enum HostDescription {
 	Hostname(String),
 	Pattern(glob::Pattern),
@@ -38,20 +36,153 @@ impl HostDescription {
 	}
 }
 
-#[derive(Debug)]
+impl std::fmt::Display for HostDescription {
-pub struct ProxyEntry {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		match self {
+			HostDescription::Hostname(h) => write!(f, "{}", h),
+			HostDescription::Pattern(p) => write!(f, "[{}]", p.as_str()),
+		}
+	}
+}
+
+#[derive(Debug, Clone)]
+pub struct UrlPrefix {
 	/// Publicly exposed TLS hostnames for matching this rule
 	pub host: HostDescription,
+
 	/// Path prefix for matching this rule
 	pub path_prefix: Option<String>,
+}
+
+impl PartialEq for UrlPrefix {
+	fn eq(&self, other: &Self) -> bool {
+		self.host == other.host && self.path_prefix == other.path_prefix
+	}
+}
+impl Eq for UrlPrefix {}
+
+impl UrlPrefix {
+	fn new(raw_prefix: &str) -> Option<Self> {
+		let (raw_host, path_prefix) = match raw_prefix.find('/') {
+			Some(i) => {
+				let (host, pp) = raw_prefix.split_at(i);
+				(host, Some(pp.to_string()))
+			}
+			None => (raw_prefix, None),
+		};
+
+		let host = match HostDescription::new(raw_host) {
+			Ok(h) => h,
+			Err(e) => {
+				warn!("Invalid hostname pattern {}: {}", raw_host, e);
+				return None;
+			}
+		};
+
+		Some(Self { host, path_prefix })
+	}
+}
+
+#[derive(Debug)]
+pub struct ProxyEntry {
+	/// An Url prefix is made of a host and maybe a path prefix
+	pub url_prefix: UrlPrefix,
 	/// Priority with which this rule is considered (highest first)
 	pub priority: u32,
 
+	/// Consul service name
+	pub service_name: String,
 	/// Node address (ip+port) to handle requests that match this entry
 	pub target_addr: SocketAddr,
 	/// Is the target serving HTTPS instead of HTTP?
 	pub https_target: bool,
 
+	/// Flags for target selection
+	pub flags: ProxyEntryFlags,
+
+	/// Add the following headers to all responses returned
+	/// when matching this rule
+	pub add_headers: Vec<(String, String)>,
+
+	/// Try to match all these redirection before forwarding to the backend
+	/// when matching this rule
+	pub redirects: Vec<(UrlPrefix, UrlPrefix, u16)>,
+
+	/// Wether or not the domain must be validated before asking a certificate
+	/// to let's encrypt (only for Glob patterns)
+	pub on_demand_tls_ask: Option<String>,
+
+	/// Number of calls in progress, used to deprioritize slow back-ends
+	pub calls_in_progress: atomic::AtomicI64,
+	/// Time of last call, used for round-robin selection
+	pub last_call: atomic::AtomicI64,
+}
+
+impl PartialEq for ProxyEntry {
+	fn eq(&self, other: &Self) -> bool {
+		self.url_prefix == other.url_prefix
+			&& self.priority == other.priority
+			&& self.service_name == other.service_name
+			&& self.target_addr == other.target_addr
+			&& self.https_target == other.https_target
+			&& self.flags == other.flags
+			&& self.add_headers == other.add_headers
+	}
+}
+impl Eq for ProxyEntry {}
+
+impl ProxyEntry {
+	fn new(
+		service_name: String,
+		frontend: MatchTag,
+		target_addr: SocketAddr,
+		middleware: &[ConfigTag],
+		flags: ProxyEntryFlags,
+	) -> Self {
+		let (url_prefix, priority, https_target) = match frontend {
+			MatchTag::Http(u, p) => (u, p, false),
+			MatchTag::HttpWithTls(u, p) => (u, p, true),
+		};
+
+		let mut add_headers = vec![];
+		let mut redirects = vec![];
+		let mut on_demand_tls_ask: Option<String> = None;
+		for mid in middleware.into_iter() {
+			// LocalLb and GlobalLb are handled in the parent function
+			match mid {
+				ConfigTag::AddHeader(k, v) => add_headers.push((k.to_string(), v.clone())),
+				ConfigTag::AddRedirect(m, r, c) => redirects.push(((*m).clone(), (*r).clone(), *c)),
+				ConfigTag::OnDemandTlsAsk(url) => on_demand_tls_ask = Some(url.to_string()),
+				ConfigTag::LocalLb | ConfigTag::GlobalLb => (),
+			};
+		}
+
+		ProxyEntry {
+			// id
+			service_name,
+			// frontend
+			url_prefix,
+			priority,
+			// backend
+			target_addr,
+			https_target,
+			// middleware
+			flags,
+			add_headers,
+			redirects,
+			on_demand_tls_ask,
+			// internal
+			last_call: atomic::AtomicI64::from(0),
+			calls_in_progress: atomic::AtomicI64::from(0),
+		}
+	}
+}
+
+#[derive(Debug, Clone, Copy, Eq, PartialEq)]
+pub struct ProxyEntryFlags {
+	/// Is the target healthy?
+	pub healthy: bool,
+
 	/// Is the target the same node as we are running on?
 	/// (if yes priorize it over other matching targets)
 	pub same_node: bool,
@@ -59,14 +190,10 @@ pub struct ProxyEntry {
 	/// (if yes priorize it over other matching targets)
 	pub same_site: bool,
 
-	/// Add the following headers to all responses returned
+	/// Is site-wide load balancing enabled for this service?
-	/// when matching this rule
+	pub site_lb: bool,
-	pub add_headers: Vec<(String, String)>,
+	/// Is global load balancing enabled for this service?
-
+	pub global_lb: bool,
-	// Counts the number of times this proxy server has been called to
-	// This implements a round-robin load balancer if there are multiple
-	// entries for the same host and same path prefix.
-	pub calls: atomic::AtomicI64,
 }
 
 impl std::fmt::Display for ProxyEntry {
@@ -75,148 +202,203 @@ impl std::fmt::Display for ProxyEntry {
 			write!(f, "https://")?;
 		}
 		write!(f, "{} ", self.target_addr)?;
-		match &self.host {
-			HostDescription::Hostname(h) => write!(f, "{}", h)?,
-			HostDescription::Pattern(p) => write!(f, "Pattern('{}')", p.as_str())?,
-		}
 		write!(
 			f,
-			"{} {}",
+			"{}{} {}",
-			self.path_prefix.as_ref().unwrap_or(&String::new()),
+			self.url_prefix.host,
+			self.url_prefix.path_prefix.as_deref().unwrap_or_default(),
 			self.priority
 		)?;
-		if self.same_node {
+		if !self.flags.healthy {
+			write!(f, " UNHEALTHY")?;
+		}
+		if self.flags.same_node {
 			write!(f, " OURSELF")?;
-		} else if self.same_site {
+		} else if self.flags.same_site {
 			write!(f, " SAME_SITE")?;
 		}
+		if self.flags.global_lb {
+			write!(f, " GLOBAL-LB")?;
+		} else if self.flags.site_lb {
+			write!(f, " SITE-LB")?;
+		}
 		if !self.add_headers.is_empty() {
 			write!(f, " +Headers: {:?}", self.add_headers)?;
 		}
-		write!(f, " ({})", self.calls.load(atomic::Ordering::Relaxed))
+		Ok(())
 	}
 }
 
-#[derive(Debug)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct ProxyConfig {
 	pub entries: Vec<ProxyEntry>,
 }
 
-fn retry_to_time(retries: u32, max_time: Duration) -> Duration {
+#[derive(Debug)]
-	// 1.2^x seems to be a good value to exponentially increase time at a good pace
+enum ParsedTag<'a> {
-	// eg. 1.2^32 = 341 seconds ~= 5 minutes - ie. after 32 retries we wait 5
+	Frontend(MatchTag),
-	// minutes
+	Middleware(ConfigTag<'a>),
-	Duration::from_secs(cmp::min(
-		max_time.as_secs(),
-		1.2f64.powf(retries as f64) as u64,
-	))
 }
 
-fn parse_tricot_tag(
+#[derive(Debug)]
-	tag: &str,
+enum MatchTag {
-	target_addr: SocketAddr,
+	/// HTTP backend (plain text)
-	add_headers: &[(String, String)],
+	Http(UrlPrefix, u32),
-	same_node: bool,
+	/// HTTPS backend (TLS encrypted)
-	same_site: bool,
+	HttpWithTls(UrlPrefix, u32),
-) -> Option<ProxyEntry> {
+}
-	let splits = tag.split(' ').collect::<Vec<_>>();
+
-	if (splits.len() != 2 && splits.len() != 3)
+#[derive(Debug)]
-		|| (splits[0] != "tricot" && splits[0] != "tricot-https")
+enum ConfigTag<'a> {
-	{
+	AddHeader(&'a str, String),
-		return None;
+	AddRedirect(UrlPrefix, UrlPrefix, u16),
+	OnDemandTlsAsk(&'a str),
+	GlobalLb,
+	LocalLb,
+}
+
+fn parse_tricot_tags(tag: &str) -> Option<ParsedTag> {
+	let splits = tag.splitn(4, ' ').collect::<Vec<_>>();
+	let parsed_tag = match splits.as_slice() {
+		["tricot", raw_prefix, maybe_priority @ ..] => {
+			// priority is set to 100 when value is invalid or missing
+			let priority: u32 = maybe_priority
+				.iter()
+				.next()
+				.map_or(Ok(100), |x| x.parse::<u32>())
+				.unwrap_or(100);
+			UrlPrefix::new(raw_prefix)
+				.map(|prefix| ParsedTag::Frontend(MatchTag::Http(prefix, priority)))
 		}
-
+		["tricot-https", raw_prefix, maybe_priority @ ..] => {
-	let (host, path_prefix) = match splits[1].find('/') {
+			// priority is set to 100 when value is invalid or missing
-		Some(i) => {
+			let priority: u32 = maybe_priority
-			let (host, pp) = splits[1].split_at(i);
+				.iter()
-			(host, Some(pp.to_string()))
+				.next()
+				.map_or(Ok(100), |x| x.parse::<u32>())
+				.unwrap_or(100);
+			UrlPrefix::new(raw_prefix)
+				.map(|prefix| ParsedTag::Frontend(MatchTag::HttpWithTls(prefix, priority)))
 		}
-		None => (splits[1], None),
+		["tricot-add-header", header_key, header_values @ ..] => Some(ParsedTag::Middleware(
-	};
+			ConfigTag::AddHeader(header_key, header_values.join(" ")),
-
+		)),
-	let priority = match splits.len() {
+		["tricot-add-redirect", raw_match, raw_replace, maybe_raw_code @ ..] => {
-		3 => splits[2].parse().ok()?,
+			let (p_match, p_replace) =
-		_ => 100,
+				match (UrlPrefix::new(raw_match), UrlPrefix::new(raw_replace)) {
-	};
+					(Some(m), Some(r)) => (m, r),
-
+					_ => {
-	let host = match HostDescription::new(host) {
+						debug!(
-		Ok(h) => h,
+							"tag {} is ignored, one of the url prefix can't be parsed",
-		Err(e) => {
+							tag
-			warn!("Invalid hostname pattern {}: {}", host, e);
+						);
 						return None;
 					}
 				};
 
-	Some(ProxyEntry {
+			if matches!(p_replace.host, HostDescription::Pattern(_)) {
-		target_addr,
+				debug!(
-		https_target: (splits[0] == "tricot-https"),
+					"tag {} ignored as redirect to a glob pattern is not supported",
-		host,
+					tag
-		same_node,
+				);
-		same_site,
+				return None;
-		path_prefix,
-		priority,
-		add_headers: add_headers.to_vec(),
-		calls: atomic::AtomicI64::from(0),
-	})
-}
-
-fn parse_tricot_add_header_tag(tag: &str) -> Option<(String, String)> {
-	let splits = tag.split(' ').collect::<Vec<_>>();
-	if splits.len() == 3 && splits[0] == "tricot-add-header" {
-		Some((splits[1].to_string(), splits[2].to_string()))
-	} else {
-		None
 			}
+
+			let maybe_parsed_code = maybe_raw_code
+				.iter()
+				.next()
+				.map(|c| c.parse::<u16>().ok())
+				.flatten();
+			let http_code = match maybe_parsed_code {
+				Some(301) => 301,
+				Some(302) => 302,
+				Some(303) => 303,
+				Some(307) => 307,
+				_ => {
+					debug!(
+						"tag {} has a missing or invalid http code, setting it to 302",
+						tag
+					);
+					302
+				}
+			};
+
+			Some(ParsedTag::Middleware(ConfigTag::AddRedirect(
+				p_match, p_replace, http_code,
+			)))
+		}
+		["tricot-on-demand-tls-ask", url, ..] => {
+			Some(ParsedTag::Middleware(ConfigTag::OnDemandTlsAsk(url)))
+		}
+		["tricot-global-lb", ..] => Some(ParsedTag::Middleware(ConfigTag::GlobalLb)),
+		["tricot-local-lb", ..] => Some(ParsedTag::Middleware(ConfigTag::LocalLb)),
+		_ => None,
+	};
+
+	trace!("tag {} parsed as {:?}", tag, parsed_tag);
+	parsed_tag
 }
 
-fn parse_consul_catalog(
+fn parse_consul_service(
-	catalog: &ConsulNodeCatalog,
+	s: &consul::catalog::HealthServiceNode,
-	same_node: bool,
+	mut flags: ProxyEntryFlags,
-	same_site: bool,
 ) -> Vec<ProxyEntry> {
-	trace!("Parsing node catalog: {:#?}", catalog);
+	trace!("Parsing service: {:#?}", s);
 
-	let mut entries = vec![];
+	let ip_addr = match s.service.address.parse() {
-
-	for (_, svc) in catalog.services.iter() {
-		let ip_addr = match svc.address.parse() {
 		Ok(ip) => ip,
-			_ => match catalog.node.address.parse() {
+		_ => match s.node.address.parse() {
 			Ok(ip) => ip,
 			_ => {
 				warn!(
 					"Could not get address for service {} at node {}",
-						svc.service, catalog.node.node
+					s.service.service, s.node.node
 				);
-					continue;
+				return vec![];
 			}
 		},
 	};
-		let addr = SocketAddr::new(ip_addr, svc.port);
+	let addr = SocketAddr::new(ip_addr, s.service.port);
 
-		let (same_node, same_site) = if svc.tags.contains(&"tricot-global-lb".into()) {
+	// tag parsing
-			(false, false)
+	let mut collected_middleware = vec![];
-		} else if svc.tags.contains(&"tricot-site-lb".into()) {
+	let mut collected_frontends = vec![];
-			(false, same_site)
+	for tag in s.service.tags.iter() {
-		} else {
+		match parse_tricot_tags(tag) {
-			(same_node, same_site)
+			Some(ParsedTag::Frontend(x)) => collected_frontends.push(x),
+			Some(ParsedTag::Middleware(y)) => collected_middleware.push(y),
+			_ => trace!(
+				"service {}: tag '{}' could not be parsed",
+				s.service.service,
+				tag
+			),
+		}
+	}
+
+	// some legacy processing that would need a refactor later
+	for mid in collected_middleware.iter() {
+		match mid {
+			ConfigTag::GlobalLb => flags.global_lb = true,
+			ConfigTag::LocalLb => flags.site_lb = true,
+			_ => (),
 		};
-
-		let mut add_headers = vec![];
-		for tag in svc.tags.iter() {
-			if let Some(pair) = parse_tricot_add_header_tag(tag) {
-				add_headers.push(pair);
-			}
 	}
 
-		for tag in svc.tags.iter() {
+	// build proxy entries
-			if let Some(ent) = parse_tricot_tag(tag, addr, &add_headers[..], same_node, same_site) {
+	let entries = collected_frontends
-				entries.push(ent);
+		.into_iter()
-			}
+		.map(|frt| {
-		}
+			ProxyEntry::new(
-	}
+				s.service.service.clone(),
+				frt,
+				addr,
+				collected_middleware.as_ref(),
+				flags,
+			)
+		})
+		.collect::<Vec<_>>();
 
-	trace!("Result of parsing catalog:");
+	trace!("Result of parsing service:");
 	for ent in entries.iter() {
 		trace!("    {}", ent);
 	}
@@ -224,131 +406,132 @@ fn parse_consul_catalog(
 	entries
 }
 
-#[derive(Default)]
-struct NodeWatchState {
-	last_idx: Option<usize>,
-	last_catalog: Option<ConsulNodeCatalog>,
-	retries: u32,
-}
-
 pub fn spawn_proxy_config_task(
-	consul: Consul,
+	consul: consul::Consul,
+	local_node: String,
 	mut must_exit: watch::Receiver<bool>,
 ) -> watch::Receiver<Arc<ProxyConfig>> {
 	let (tx, rx) = watch::channel(Arc::new(ProxyConfig {
 		entries: Vec::new(),
 	}));
 
+	let metrics = ProxyConfigMetrics::new(rx.clone());
 	let consul = Arc::new(consul);
 
 	tokio::spawn(async move {
-		let mut nodes = HashMap::new();
+		let mut catalog_rx = consul.watch_all_service_health(Duration::from_secs(300));
-		let mut watches = FuturesUnordered::<BoxFuture<'static, (String, Result<_>)>>::new();
+		let mut local_node_site = None;
-
-		let mut node_site = HashMap::new();
 
 		while !*must_exit.borrow() {
-			let list_nodes = select! {
+			select! {
-				ln = consul.list_nodes() => ln,
+				_ = catalog_rx.changed() => (),
 				_ = must_exit.changed() => continue,
 			};
 
-			match list_nodes {
+			let services = catalog_rx.borrow_and_update().clone();
-				Ok(consul_nodes) => {
+			if local_node_site.is_none() {
-					info!("Watched consul nodes: {:?}", consul_nodes);
+				for (_, svcnodes) in services.iter() {
-					for consul_node in consul_nodes {
+					for svcnode in svcnodes.iter() {
-						let node = &consul_node.node;
+						if svcnode.node.node == local_node {
-						if !nodes.contains_key(node) {
+							if let Some(site) = svcnode.node.meta.get("site") {
-							nodes.insert(node.clone(), NodeWatchState::default());
+								local_node_site = Some(site.to_string());
-
-							let node = node.to_string();
-							let consul = consul.clone();
-
-							watches.push(Box::pin(async move {
-								let res = consul.watch_node(&node, None).await;
-								(node, res)
-							}));
-						}
-						if let Some(site) = consul_node.meta.get("site") {
-							node_site.insert(node.clone(), site.clone());
 							}
 						}
 					}
-				Err(e) => {
-					warn!("Could not get Consul node list: {}", e);
-				}
-			}
-
-			let next_watch = select! {
-				nw = watches.next() => nw,
-				_ = must_exit.changed() => continue,
-			};
-
-			let (node, res): (String, Result<_>) = match next_watch {
-				Some(v) => v,
-				None => {
-					warn!("No nodes currently watched in proxy_config.rs");
-					sleep(Duration::from_secs(10)).await;
-					continue;
-				}
-			};
-
-			match res {
-				Ok((catalog, new_idx)) => {
-					let mut watch_state = nodes.get_mut(&node).unwrap();
-					watch_state.last_idx = Some(new_idx);
-					watch_state.last_catalog = Some(catalog);
-					watch_state.retries = 0;
-
-					let idx = watch_state.last_idx;
-					let consul = consul.clone();
-					watches.push(Box::pin(async move {
-						let res = consul.watch_node(&node, idx).await;
-						(node, res)
-					}));
-				}
-				Err(e) => {
-					let mut watch_state = nodes.get_mut(&node).unwrap();
-					watch_state.retries += 1;
-					watch_state.last_idx = None;
-
-					let will_retry_in =
-						retry_to_time(watch_state.retries, Duration::from_secs(600));
-					error!(
-						"Failed to query consul for node {}. Will retry in {}s. {}",
-						node,
-						will_retry_in.as_secs(),
-						e
-					);
-
-					let consul = consul.clone();
-					watches.push(Box::pin(async move {
-						sleep(will_retry_in).await;
-						let res = consul.watch_node(&node, None).await;
-						(node, res)
-					}));
-					continue;
 				}
 			}
 
 			let mut entries = vec![];
-			for (node_name, watch_state) in nodes.iter() {
+
-				if let Some(catalog) = &watch_state.last_catalog {
+			for (_service, svcnodes) in services.iter() {
-					let same_node = *node_name == consul.local_node;
+				for svcnode in svcnodes.iter() {
-					let same_site =
+					let healthy = !svcnode.checks.iter().any(|x| x.status == "critical");
-						match (node_site.get(node_name), node_site.get(&consul.local_node)) {
+
+					let same_node = svcnode.node.node == local_node;
+					let same_site = match (svcnode.node.meta.get("site"), local_node_site.as_ref())
+					{
 						(Some(s1), Some(s2)) => s1 == s2,
 						_ => false,
 					};
 
-					entries.extend(parse_consul_catalog(catalog, same_node, same_site));
+					let flags = ProxyEntryFlags {
+						healthy,
+						same_node,
+						same_site,
+						site_lb: false,
+						global_lb: false,
+					};
+
+					entries.extend(parse_consul_service(&svcnode, flags));
 				}
 			}
+
+			entries.sort_by_cached_key(|ent| ent.to_string());
+
 			let config = ProxyConfig { entries };
 
 			tx.send(Arc::new(config)).expect("Internal error");
 		}
+
+		drop(metrics); // ensure Metrics lives up to here
 	});
 
 	rx
 }
+
+// ----
+
+struct ProxyConfigMetrics {
+	_proxy_config_entries: metrics::ObservableGauge<u64>,
+}
+
+impl ProxyConfigMetrics {
+	fn new(rx: watch::Receiver<Arc<ProxyConfig>>) -> Self {
+		let meter = opentelemetry::global::meter("tricot");
+		Self {
+			_proxy_config_entries: meter
+				.u64_observable_gauge("proxy_config_entries")
+				.with_callback(move |observer| {
+					let mut patterns = HashMap::new();
+					for ent in rx.borrow().entries.iter() {
+						let attrs = (
+							ent.url_prefix.host.to_string(),
+							ent.url_prefix.path_prefix.clone().unwrap_or_default(),
+							ent.service_name.clone(),
+						);
+						*patterns.entry(attrs).or_default() += 1;
+					}
+					for ((host, prefix, svc), num) in patterns {
+						observer.observe(
+							num,
+							&[
+								KeyValue::new("host", host),
+								KeyValue::new("path_prefix", prefix),
+								KeyValue::new("service", svc),
+							],
+						);
+					}
+				})
+				.with_description("Number of proxy entries (back-ends) configured in Tricot")
+				.init(),
+		}
+	}
+}
+
+// ----
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn test_parse_tricot_add_header_tag() {
+		match parse_tricot_tags("tricot-add-header Content-Security-Policy default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'") {
+          Some(ParsedTag::Middleware(ConfigTag::AddHeader(name, value))) => {
+            assert_eq!(name, "Content-Security-Policy");
+            assert_eq!(value, "default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'");
+          }
+          _ => panic!("Passed a valid tag but the function says it is not valid")
+        }
+	}
+}

src/reverse_proxy.rs

@@ -8,9 +8,9 @@ use std::sync::Arc;
 use std::time::{Duration, SystemTime};
 
 use anyhow::Result;
-use log::*;
+use tracing::*;
 
-use http::header::HeaderName;
+use http::{header::HeaderName, StatusCode};
 use hyper::header::{HeaderMap, HeaderValue};
 use hyper::{client::HttpConnector, header, Body, Client, Request, Response, Uri};
 use rustls::client::{ServerCertVerified, ServerCertVerifier};
@@ -48,9 +48,25 @@ fn remove_hop_headers(headers: &HeaderMap<HeaderValue>) -> HeaderMap<HeaderValue
 	result
 }
 
-fn create_proxied_response<B>(mut response: Response<B>) -> Response<B> {
+fn copy_upgrade_headers(
-	*response.headers_mut() = remove_hop_headers(response.headers());
+	old_headers: &HeaderMap<HeaderValue>,
-	response
+	new_headers: &mut HeaderMap<HeaderValue>,
+) -> Result<bool> {
+	// The Connection header is stripped as it is a hop header that we are not supposed to proxy.
+	// However, it might also contain an Upgrade directive, e.g. for Websockets:
+	// when that happen, we do want to preserve that directive.
+	let mut is_upgrade = false;
+	if let Some(conn) = old_headers.get(header::CONNECTION) {
+		let conn_str = conn.to_str()?.to_lowercase();
+		if conn_str.split(',').map(str::trim).any(|x| x == "upgrade") {
+			if let Some(upgrade) = old_headers.get(header::UPGRADE) {
+				new_headers.insert(header::CONNECTION, "Upgrade".try_into()?);
+				new_headers.insert(header::UPGRADE, upgrade.clone());
+				is_upgrade = true;
+			}
+		}
+	}
+	Ok(is_upgrade)
 }
 
 fn forward_uri<B>(forward_url: &str, req: &Request<B>) -> Result<Uri> {
@@ -62,22 +78,23 @@ fn forward_uri<B>(forward_url: &str, req: &Request<B>) -> Result<Uri> {
 	Ok(Uri::from_str(forward_uri.as_str())?)
 }
 
-fn create_proxied_request<B>(
+fn create_proxied_request<B: std::default::Default>(
 	client_ip: IpAddr,
 	forward_url: &str,
 	request: Request<B>,
-) -> Result<Request<B>> {
+) -> Result<(Request<B>, Option<Request<B>>)> {
 	let mut builder = Request::builder()
 		.method(request.method())
 		.uri(forward_uri(forward_url, &request)?)
 		.version(hyper::Version::HTTP_11);
 
-	let headers = builder.headers_mut().unwrap();
+	let old_headers = request.headers();
+	let new_headers = builder.headers_mut().unwrap();
 
-	*headers = remove_hop_headers(request.headers());
+	*new_headers = remove_hop_headers(old_headers);
 
 	// If request does not have host header, add it from original URI authority
-	if let header::Entry::Vacant(entry) = headers.entry(header::HOST) {
+	if let header::Entry::Vacant(entry) = new_headers.entry(header::HOST) {
 		if let Some(authority) = request.uri().authority() {
 			entry.insert(authority.as_str().parse()?);
 		}
@@ -86,7 +103,7 @@ fn create_proxied_request<B>(
 	// Concatenate cookie headers into single header
 	// (HTTP/2 allows several cookie headers, but we are proxying to HTTP/1.1 that does not)
 	let mut cookie_concat = vec![];
-	for cookie in headers.get_all(header::COOKIE) {
+	for cookie in new_headers.get_all(header::COOKIE) {
 		if !cookie_concat.is_empty() {
 			cookie_concat.extend(b"; ");
 		}
@@ -94,12 +111,12 @@ fn create_proxied_request<B>(
 	}
 	if !cookie_concat.is_empty() {
 		// insert clears the old value of COOKIE and inserts the concatenated version instead
-		headers.insert(header::COOKIE, cookie_concat.try_into()?);
+		new_headers.insert(header::COOKIE, cookie_concat.try_into()?);
 	}
 
 	// Add forwarding information in the headers
 	let x_forwarded_for_header_name = "x-forwarded-for";
-	match headers.entry(x_forwarded_for_header_name) {
+	match new_headers.entry(x_forwarded_for_header_name) {
 		header::Entry::Vacant(entry) => {
 			entry.insert(client_ip.to_string().parse()?);
 		}
@@ -110,22 +127,63 @@ fn create_proxied_request<B>(
 		}
 	}
 
-	headers.insert(
+	new_headers.insert(
 		HeaderName::from_bytes(b"x-forwarded-proto")?,
 		"https".try_into()?,
 	);
 
 	// Proxy upgrade requests properly
-	if let Some(conn) = request.headers().get(header::CONNECTION) {
+	let is_upgrade = copy_upgrade_headers(old_headers, new_headers)?;
-		if conn.to_str()?.to_lowercase() == "upgrade" {
-			if let Some(upgrade) = request.headers().get(header::UPGRADE) {
-				headers.insert(header::CONNECTION, "Upgrade".try_into()?);
-				headers.insert(header::UPGRADE, upgrade.clone());
-			}
-		}
-	}
 
-	Ok(builder.body(request.into_body())?)
+	if is_upgrade {
+		Ok((builder.body(B::default())?, Some(request)))
+	} else {
+		Ok((builder.body(request.into_body())?, None))
+	}
+}
+
+async fn create_proxied_response<B: std::default::Default + Send + Sync + 'static>(
+	mut response: Response<B>,
+	upgrade_request: Option<Request<B>>,
+) -> Result<Response<B>> {
+	let old_headers = response.headers();
+
+	let mut new_headers = remove_hop_headers(old_headers);
+	copy_upgrade_headers(old_headers, &mut new_headers)?;
+
+	if response.status() == StatusCode::SWITCHING_PROTOCOLS {
+		if let Some(mut req) = upgrade_request {
+			let mut res_upgraded = hyper::upgrade::on(response).await?;
+
+			tokio::spawn(async move {
+				match hyper::upgrade::on(&mut req).await {
+					Ok(mut req_upgraded) => {
+						if let Err(e) =
+							tokio::io::copy_bidirectional(&mut req_upgraded, &mut res_upgraded)
+								.await
+						{
+							warn!("Error copying data in upgraded request: {}", e);
+						}
+					}
+					Err(e) => {
+						warn!(
+							"Could not upgrade client request when switching protocols: {}",
+							e
+						);
+					}
+				}
+			});
+
+			let mut new_res = Response::builder().status(StatusCode::SWITCHING_PROTOCOLS);
+			*new_res.headers_mut().unwrap() = new_headers;
+			Ok(new_res.body(B::default())?)
+		} else {
+			Err(anyhow!("Switching protocols but not an upgrade request"))
+		}
+	} else {
+		*response.headers_mut() = new_headers;
+		Ok(response)
+	}
 }
 
 pub async fn call(
@@ -133,7 +191,8 @@ pub async fn call(
 	forward_uri: &str,
 	request: Request<Body>,
 ) -> Result<Response<Body>> {
-	let proxied_request = create_proxied_request(client_ip, forward_uri, request)?;
+	let (proxied_request, upgrade_request) =
+		create_proxied_request(client_ip, forward_uri, request)?;
 
 	trace!("Proxied request: {:?}", proxied_request);
 
@@ -146,7 +205,7 @@ pub async fn call(
 
 	trace!("Inner response: {:?}", response);
 
-	let proxied_response = create_proxied_response(response);
+	let proxied_response = create_proxied_response(response, upgrade_request).await?;
 	Ok(proxied_response)
 }
 
@@ -155,7 +214,8 @@ pub async fn call_https(
 	forward_uri: &str,
 	request: Request<Body>,
 ) -> Result<Response<Body>> {
-	let proxied_request = create_proxied_request(client_ip, forward_uri, request)?;
+	let (proxied_request, upgrade_request) =
+		create_proxied_request(client_ip, forward_uri, request)?;
 
 	trace!("Proxied request (HTTPS): {:?}", proxied_request);
 
@@ -173,7 +233,7 @@ pub async fn call_https(
 
 	trace!("Inner response (HTTPS): {:?}", response);
 
-	let proxied_response = create_proxied_response(response);
+	let proxied_response = create_proxied_response(response, upgrade_request).await?;
 	Ok(proxied_response)
 }