Skip to content
Permalink
Browse files

purge all references to the report-server

  • Loading branch information...
cleverca22 committed Jun 13, 2019
1 parent 44c5f1c commit d712a145fd4a561ed151c624efaf266fbfe846ad
@@ -18,9 +18,6 @@ let nodeMap = globals.nodeMap; in
};
});

disk = mkMonitor (disk_monitor "!host:rc-staging.ec2.report-server" "0.8" "0.9" // {
message = pagerDutyPolicy.nonCritical;
});
inodes = mkMonitor ((inodes_monitor 7 2) // {
message = pagerDutyPolicy.nonCritical;
});

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -123,7 +123,6 @@ with import ../lib.nix;
centralRegionSGNames = centralRegion:
[ "allow-to-explorer-${centralRegion}"
"allow-to-faucet-${centralRegion}"
"allow-to-report-server-${centralRegion}"
];
centralRegionSGs = centralRegion:
let region = centralRegion;
@@ -154,15 +153,6 @@ with import ../lib.nix;
sourceIp = "0.0.0.0/0";
}];
};
"allow-to-report-server-${region}" = {
inherit region accessKeyId;
description = "Access Cardano report server";
rules = [{
protocol = "tcp";
fromPort = 8080; toPort = 8080;
sourceIp = "0.0.0.0/0";
}];
};
}];
in listToAttrs sgs;
}
@@ -30,7 +30,7 @@ This should all be _in lowercase_ to avoid problems when updating DNS entries.
1. optional: `git checkout SOME-BRANCH`
1. `iohk-ops set-rev cardanosl CARDANO-REVISION`
1. `nix-shell -A withAuxx`
1. `io new [--dont-generate-keys] [--configuration-key CONFIGURATION-KEY] ISSUE-ID Nodes [Explorer] [ReportServer]`
1. `io new [--dont-generate-keys] [--configuration-key CONFIGURATION-KEY] ISSUE-ID Nodes [Explorer]`
- the `CONFIGURATION-KEY` defaults to `devnet`
- this will generate stake keys using `cardano-keygen`, unless `--dont-generate-keys` was passed
- the elements after `ISSUE-ID` name cluster components, for the CSL nodes, explorer and report server, correspondingly -- which all are, strictly speaking, optional, with the caveat that having a `Nodes`-free cluster doesn't make a lot of sense
@@ -69,7 +69,7 @@ When one wants to redeploy a cluster, it's not necessary to destroy the machines
This uses the customizable wallet connect script generator in cardano-sl
(see [Exchange Onboarding](https://github.com/input-output-hk/cardano-sl/blob/develop/docs/exchange-onboarding.md#generate-custom-configuration)).

You need to clone the `cardano-sl` repository and checkout the
You need to clone the `cardano-sl` repository and checkout the
particular commit used in `io set-rev` (see `rev` attribute of `cardano-sl-src.json`):

1. `git clone https://github.com/input-output-hk/cardano-sl.git && cd cardano-sl`
@@ -25,7 +25,7 @@ For an example deployment scenario, see [Example Deployment](#example-deployment
- `template [--node-limit N] [--environment ENV] [--target TGT] BRANCH DEPLOYMENT...`: produce (or update) a checkout of BRANCH with a configuration YAML file (whose name depends on the _environment_), primed for future operations.
- `--node-limit` allows patch-less limiting of the cluster size; A suitable value is `4` _: -)_
- `set-cardano COMMIT`, `set-explorer COMMIT`: set the `cardano-sl-src.json` and `cardano-sl-explorer-src.json` with inputs, suitable to parametrise various ops, for instance `pkgs/generate.sh`
- `mini-keys`: fake/request/provide a minimum set of keys required for a minimum complete deployment (_explorer_ + _report-server_ + _nodes_ -- henceforth referred to as MCD)
- `mini-keys`: fake/request/provide a minimum set of keys required for a minimum complete deployment (_explorer_ + _nodes_ -- henceforth referred to as MCD)
- `do`: chain commands, like:

```
@@ -56,11 +56,11 @@ First, let's assume the following:

- it's a _development_ environment cluster
- we want to limit cluster size to 4 nodes
- we want the full package: _nodes_, _cardano-explorer_ and _report-server_
- we want the full package: _nodes_ and _cardano-explorer_

This translates to:
```
$ io template --environment development --node-limit 4 some-branch Nodes Explorer ReportServer
$ io template --environment development --node-limit 4 some-branch Nodes Explorer
...observe git clone
...observe the generated config.yaml
$ cd some-branch
@@ -111,7 +111,7 @@ The following subcommands have been rolled into a single
- `find-installers`
- `s3upload`
- `set-version-json`

See [Daedalus Installer Update Procedure](./Daedalus-Installer-Update-Procedure.md)
for instructions.

@@ -40,18 +40,6 @@ let topologySpec = builtins.fromJSON (builtins.readFile topologyFile);
address = "faucet.cardano";
port = 3000; }; };

reportServerSpecElt =
{ name = "report-server";
value = { org = defaultOrg;
region = centralRegion;
zone = centralZone;
public = false;
type = "other";
kademlia = false;
peers = [];
address = "report-server.cardano";
port = null; }; };

monitoringSpecElt =
{ name = "monitoring";
value = { org = defaultOrg;
@@ -86,7 +74,6 @@ let topologySpec = builtins.fromJSON (builtins.readFile topologyFile);
typeIsExplorer = name == "explorer";
typeIsFaucet = name == "faucet";
typeIsRunsCardano = typeIsCore || typeIsRelay || typeIsExplorer || typeIsFaucet;
typeIsReportServer = name == "report-server";
typeIsMonitoring = name == "monitoring";
accessKeyId = if elem org allOrgs
then orgAccessKeys.${org}
@@ -109,10 +96,9 @@ let topologySpec = builtins.fromJSON (builtins.readFile topologyFile);
##
explorerNV = findFirst (x: x.value.typeIsExplorer) {} indexed;
faucetNV = findFirst (x: x.value.typeIsFaucet) {} indexed;
reportServerNV = findFirst (x: x.value.typeIsReportServer) {} indexed;
monitoringNV = findFirst (x: x.value.typeIsMonitoring) {} indexed;
fullMap = nodeMap // listToAttrs (builtins.filter (x: x != {})
[ explorerNV faucetNV reportServerNV monitoringNV ]);
[ explorerNV faucetNV monitoringNV ]);
in
{
inherit topologyYaml;
@@ -81,7 +81,6 @@ envSettings :: HasCallStack => Environment -> EnvSettings
envSettings env =
let deplAgnosticFiles = [ (Every, All, "deployments/keypairs.nix")
, (Explorer, All, "deployments/cardano-explorer.nix")
, (ReportServer, All, "deployments/report-server.nix")
, (Faucet, All, "deployments/cardano-faucet.nix")
, (Nodes, All, "deployments/cardano-nodes.nix")
, (Infra, All, "deployments/infrastructure.nix")
@@ -97,11 +96,9 @@ envSettings env =
, envDefaultTopology = "topology-staging.yaml"
, envDeploymentFiles = [ (Nodes, All, "deployments/security-groups.nix")
, (Explorer, All, "deployments/security-groups.nix")
, (ReportServer, All, "deployments/security-groups.nix")
, (Monitoring, All, "deployments/security-groups.nix")
, (Nodes, All, "deployments/cardano-nodes-env-staging.nix")
, (Explorer, All, "deployments/cardano-explorer-env-staging.nix")
, (ReportServer, All, "deployments/report-server-env-staging.nix")
, (Monitoring, All, "deployments/monitoring-env-staging.nix")
, (Infra, All, "deployments/infrastructure-env-staging.nix")
] <> deplAgnosticFiles}
@@ -112,11 +109,9 @@ envSettings env =
, envDefaultTopology = "topology-production.yaml"
, envDeploymentFiles = [ (Nodes, All, "deployments/security-groups.nix")
, (Explorer, All, "deployments/security-groups.nix")
, (ReportServer, All, "deployments/security-groups.nix")
, (Monitoring, All, "deployments/security-groups.nix")
, (Nodes, All, "deployments/cardano-nodes-env-production.nix")
, (Explorer, All, "deployments/cardano-explorer-env-production.nix")
, (ReportServer, All, "deployments/report-server-env-production.nix")
, (Monitoring, All, "deployments/monitoring-env-production.nix")
, (Infra, All, "deployments/infrastructure-env-production.nix")
] <> deplAgnosticFiles}
@@ -131,7 +126,6 @@ envSettings env =
, (Monitoring, All, "deployments/security-groups.nix")
, (Nodes, All, "deployments/cardano-nodes-env-testnet.nix")
, (Explorer, All, "deployments/cardano-explorer-env-testnet.nix")
, (ReportServer, All, "deployments/report-server-env-testnet.nix")
, (Faucet, All, "deployments/cardano-faucet-env-testnet.nix")
, (Monitoring, All, "deployments/monitoring-env-testnet.nix")
] <> deplAgnosticFiles}
@@ -143,7 +137,6 @@ envSettings env =
, envDeploymentFiles = [ (Nodes, All, "deployments/cardano-nodes-env-development.nix")
, (Explorer, All, "deployments/cardano-explorer-env-development.nix")
, (Faucet, All, "deployments/cardano-faucet-env-development.nix")
, (ReportServer, All, "deployments/report-server-env-development.nix")
, (Monitoring, All, "deployments/monitoring-env-development.nix")
, (Every, All, "deployments/env-development.nix")
] <> deplAgnosticFiles}
@@ -167,7 +160,6 @@ envSettings env =
, envDefaultTopology = "topology-benchmark.yaml"
, envDeploymentFiles = [ (Nodes, All, "deployments/cardano-nodes-env-development.nix")
, (Explorer, All, "deployments/cardano-explorer-env-development.nix")
, (ReportServer, All, "deployments/report-server-env-development.nix")
] <> deplAgnosticFiles}
Any -> error "envSettings called with 'Any'"

@@ -139,7 +139,6 @@ data Deployment
| Faucet
| Infra
| Nodes
| ReportServer
| Monitoring
deriving (Bounded, Eq, Enum, Generic, Read, Show)
instance FromJSON Deployment
@@ -137,21 +137,6 @@ rec {
};
};

cardano_report_process_monitor = {
name = "cardano-report-server process is down";
type = "service check";
query = config: "\"process.up\".over(\"depl:${config.deployment.name}\",\"process:cardano-report-server\").by(\"host\",\"process\").last(6).count_by_status()";
monitorOptions = {
notify_no_data = true;
no_data_timeframe = 10;
thresholds = {
warning = 4;
critical = 5;
ok = 2;
};
};
};

cardano_faucet_process_monitor = {
name = "cardano-faucet process is down";
type = "service check";
@@ -18,12 +18,12 @@ with lib;
};
centralRegion = mkOption {
type = str;
description = "Region for deployer, explorer, report-server and other global services.";
description = "Region for deployer, explorer and other global services.";
default = "eu-central-1";
};
defaultOrg = mkOption {
type = enum [ "CF" "IOHK" "Emurgo" ];
description = "Organisation hosting deployer, report-server and other global services.";
description = "Organisation hosting deployer and other global services.";
default = "IOHK";
};
organisation = mkOption {

0 comments on commit d712a14

Please sign in to comment.
You can’t perform that action at this time.