Simplified, improved default dashboard for mainnet-eth-metrics. (#536)

* Simplified, improved default dashboard for mainnet-eth-metrics.

* Add missing lighthouse prometheus config.

app/data/config/mainnet-eth-metrics/prometheus/etc/prometheus.yml

@@ -10,6 +10,13 @@ scrape_configs:
     static_configs:
     - targets: ['mainnet-eth-geth-1:6060']
 
+  # lighthouse
+  - job_name: 'lighthouse'
+    metrics_path: /metrics
+    scheme: http
+    static_configs:
+    - targets: ['mainnet-eth-lighthouse-1:5054']
+
   # keycloak
   - job_name: 'keycloak'
     scrape_interval: 5s

app/data/stacks/mainnet-eth/README.md

@@ -17,7 +17,7 @@ $ laconic-so --stack mainnet-eth build-containers
 ## Create a deployment
 
 ```
-$ laconic-so --stack mainnet-eth deploy init --output mainnet-eth-spec.yml
+$ laconic-so --stack mainnet-eth deploy init --map-ports-to-host any-same --output mainnet-eth-spec.yml
 $ laconic-so deploy create --spec-file mainnet-eth-spec.yml --deployment-dir mainnet-eth-deployment
 ```
 ## Start the stack
@@ -138,4 +138,4 @@ $ sudo du -h mainnet-eth-deployment/data/
 860G    mainnet-eth-deployment/data/mainnet_eth_geth_1_data/geth
 860G    mainnet-eth-deployment/data/mainnet_eth_geth_1_data
 885G    mainnet-eth-deployment/data/
-```
+```

app/data/stacks/mainnet-eth/stack.yml

@@ -1,4 +1,4 @@
-version: "1.1"
+version: "1.2"
 name: mainnet-eth
 description: "Ethereum Mainnet"
 repos:
@@ -7,7 +7,6 @@ repos:
   - github.com/dboreham/foundry
   - git.vdb.to/cerc-io/keycloak-reg-api
   - git.vdb.to/cerc-io/keycloak-reg-ui
-  - github.com/vulcanize/eth-api-proxy
 containers:
   - cerc/go-ethereum
   - cerc/lighthouse
@@ -17,10 +16,8 @@ containers:
   - cerc/webapp-base
   - cerc/keycloak-reg-api
   - cerc/keycloak-reg-ui
-  - cerc/eth-api-proxy
 pods:
   - mainnet-eth
   - mainnet-eth-keycloak
   - mainnet-eth-metrics
-  - mainnet-eth-api-proxy
   - foundry

app/deployment_create.py

@@ -178,16 +178,18 @@ def _get_mapped_ports(stack: str, map_recipe: str):
                     ports_array = ports[service]
                     for x in range(0, len(ports_array)):
                         orig_port = ports_array[x]
+                        # Strip /udp suffix if present
+                        bare_orig_port = orig_port.replace("/udp", "")
                         random_port = random.randint(20000, 50000)  # Beware: we're relying on luck to not collide
                         if map_recipe == "any-variable-random":
                             # This is the default so take no action
                             pass
                         elif map_recipe == "localhost-same":
                             # Replace instances of "- XX" with "- 127.0.0.1:XX"
-                            ports_array[x] = f"127.0.0.1:{orig_port}:{orig_port}"
+                            ports_array[x] = f"127.0.0.1:{bare_orig_port}:{orig_port}"
                         elif map_recipe == "any-same":
                             # Replace instances of "- XX" with "- 0.0.0.0:XX"
-                            ports_array[x] = f"0.0.0.0:{orig_port}:{orig_port}"
+                            ports_array[x] = f"0.0.0.0:{bare_orig_port}:{orig_port}"
                         elif map_recipe == "localhost-fixed-random":
                             # Replace instances of "- XX" with "- 127.0.0.1:<rnd>:XX"
                             ports_array[x] = f"127.0.0.1:{random_port}:{orig_port}"

setup.py

@@ -19,8 +19,7 @@ setup(
     install_requires=[requirements],
     python_requires='>=3.7',
     include_package_data=True,
-    # See: https://github.com/pypa/setuptools/issues/1806
-    package_data={'': ['data/*', 'data/*/*', 'data/*/*/*', 'data/*/*/*/*', 'data/*/*/*/*/*']},
+    package_data={'': ['data/**']},
     classifiers=[
         "Programming Language :: Python :: 3.8",
         "Operating System :: OS Independent",