nixos-module: rename collectd metrics

gatherer/assets/style.css

@@ -47,12 +47,16 @@ header .tagline {
     right: -13rem;
     padding: 0 8rem;
     transform: translateX(-50%) rotate(45deg) translateX(50%);
-    background-color: #5582E0;
+    background-color: #FFF4BD;
 }
 .plea p {
     margin: 0;
     text-align: center;
 }
+.plea a {
+    color: #484B90;
+    font-weight: bold;
+}
 
 nav {
     display: block;
@@ -200,6 +204,9 @@ article .images .image {
 .plain fieldset {
     text-align: center;
 }
+.plain form {
+    margin-bottom: 6rem;
+}
 
 footer p {
     text-align: center;

gatherer/templates/token_donate.html

@@ -26,23 +26,23 @@
 
         <h2>Reason</h2>
         <p>
-          A token lets us connect to the <a href="https://docs.joinmastodon.org/methods/streaming/#public">the public timeline streaming API</a> of your instance so that we can include it in our sampling of the Fediverse.
+          A token lets us connect to the <a href="https://docs.joinmastodon.org/methods/streaming/#public">the public timeline streaming API</a> of your instance so that we can include it in our sampling of the Fediverse, and to redistribute it through the <a href="https://relay.fedi.buzz">#FediBuzz Relay</a>, a service that is already used by many small instances. We are very happy to run this tool in support of decentralized media, implementing what centralized services do with ease: to provide a global view. Just like search engines do for the Web.
         </p>
 
         <h2>Background</h2>
         <p>
-          Mastodon v4.2.0 <a href="https://github.com/mastodon/mastodon/pull/23989#issuecomment-1628961709">breaks unauthenticated access</a> in future versions. That really sucks for <a href="https://fedi.buzz">#FediBuzz</a> and the <a href="https://relay.fedi.buzz">#FediBuzz Relay</a>.
+          Mastodon v4.2.0 <a href="https://github.com/mastodon/mastodon/pull/23989#issuecomment-1628961709">breaks unauthenticated access</a> in future versions. That really sucks for <a href="https://fedi.buzz">#FediBuzz</a>.
         </p>
 
         <h2>Your privacy</h2>
         <p>
-          We consume only the <em>federated timeline</em>. We don't even see boosts or replies. The permissions that we request won't allow us to do anything else.
+          We consume only the <em>federated timeline</em>. We don't even see boosts or replies. The permissions that we request shouldn't allow us to do anything else.
         </p>
         <p>
           #FediBuzz gets at less data than what the Web crawlers can see. Of course, we respect the Internet standard <em>robots.txt</em>.
         </p>
         <p>
-          Despite taking these precautions on our side, we still do not recommend using ActivityPub for sensitive communications. After all, it is made for <em>publishing</em>. For private messaging we recommend <a href="https://omemo.top/">XMPP with OMEMO</a>.
+          Despite taking these precautions on our side, we still do not recommend using ActivityPub for sensitive communications. After all, it is made for <em>publishing</em>. Your data on Mastodon is already available to secret polices and script kiddies who will laugh at a robots.txt. For private messaging, we recommend <a href="https://omemo.top/">XMPP with OMEMO</a>.
         </p>
       </main>
 

gatherer/templates/token_thanks.html

@@ -24,7 +24,7 @@
           </fieldset>
         </form>
 
-        <p>
+        <p style="text-align: center">
           <a href="/">Back to #FediBuzz</a>
         </p>
       </div>

gatherer/templates/trends.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <link rel="icon" type="image/png" sizes="16x16" href="/assets/favicon16.png"/>
     <link rel="icon" type="image/png" sizes="48x48" href="/assets/favicon48.png"/>
-    <link rel="stylesheet" title="Default" type="text/css" href="/assets/style.css?12"/>
+    <link rel="stylesheet" title="Default" type="text/css" href="/assets/style.css?13"/>
 
     <meta property="og:url" content="https://fedi.buzz/"/>
     <meta property="og:type" content="website"/>
@@ -22,7 +22,7 @@
       <p class="tagline">Trends in the Fedi&#173;verse</p>
       <div class="plea">
         <p>
-          #FediBuzz needs your help!
+          <a href="/token/donate">Help #FediBuzz</a>
         <p>
         </p>
           <a href="/token/donate">Donate an API token...</a>

nixos-module.nix

@@ -166,7 +166,7 @@ in
         Statement "select count(distinct host) from instance_tokens;"
         <Result>
           Type gauge
-          InstancePrefix "unique"
+          InstancePrefix "unique_tokens"
           ValuesFrom "count"
         </Result>
       </Query>
@@ -174,7 +174,7 @@ in
         Statement "select count(*) from instance_tokens;"
         <Result>
           Type gauge
-          InstancePrefix "total"
+          InstancePrefix "total_tokens"
           ValuesFrom "count"
         </Result>
       </Query>