Skip to content

Commit

Permalink
chore: NET-1370 remove the onchain observability feature code
Browse files Browse the repository at this point in the history
  • Loading branch information
rumenov committed Aug 7, 2023
1 parent e8aa66f commit 1bcf27e
Show file tree
Hide file tree
Showing 72 changed files with 8 additions and 3,483 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ prestorecon.o
**/bin/ic-consensus-pool-util
**/bin/ic-crypto-csp
**/bin/ic-regedit
**/bin/ic-onchain-observability-adapter
**/bin/orchestrator
**/bin/replica
**/bin/state-tool
Expand Down
1 change: 0 additions & 1 deletion .gitlab/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ go_deps.bzl @dfinity-lab/teams/idx
/rs/monitoring/adapter_metrics_server/ @dfinity-lab/teams/networking-team
/rs/monitoring/adapter_metrics_service/ @dfinity-lab/teams/networking-team
/rs/monitoring/backtrace/ @dfinity-lab/teams/message-routing-owners @dfinity-lab/teams/networking-team
/rs/monitoring/onchain_observability/ @dfinity-lab/teams/networking-team
/rs/nervous_system/ @dfinity-lab/teams/nns-team
/rs/nns/ @dfinity-lab/teams/nns-team
/rs/observability/ @dfinity-lab/teams/DRE
Expand Down
108 changes: 0 additions & 108 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,6 @@ members = [
"rs/monitoring/context_logger",
"rs/monitoring/logger",
"rs/monitoring/metrics",
"rs/monitoring/onchain_observability/adapter",
"rs/monitoring/onchain_observability/canister",
"rs/monitoring/onchain_observability/server",
"rs/monitoring/onchain_observability/service",
"rs/monitoring/pprof",
"rs/nervous_system/clients",
"rs/nervous_system/common",
Expand Down
1 change: 0 additions & 1 deletion ic-os/guestos/defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ def image_deps(mode, malicious = False):
"//publish/binaries:ic-consensus-pool-util": "/opt/ic/bin/ic-consensus-pool-util:0755",
"//publish/binaries:ic-https-outcalls-adapter": "/opt/ic/bin/ic-https-outcalls-adapter:0755",
"//publish/binaries:ic-crypto-csp": "/opt/ic/bin/ic-crypto-csp:0755",
"//publish/binaries:ic-onchain-observability-adapter": "/opt/ic/bin/ic-onchain-observability-adapter:0755",
"//publish/binaries:ic-regedit": "/opt/ic/bin/ic-regedit:0755",
"//publish/binaries:ic-recovery": "/opt/ic/bin/ic-recovery:0755",
"//publish/binaries:orchestrator": "/opt/ic/bin/orchestrator:0755",
Expand Down
6 changes: 0 additions & 6 deletions ic-os/guestos/docs/ConfigStore.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,6 @@ Must be a file of key/value pairs separated by "=" (one per line) with the follo

- socks_proxy: URL of the socks proxy to use. E.g socks5://socksproxy.com:1080

=== onchain_observability_overrides.json

A json object containing config-values that will override the existing values in the onchain observability config. Key names must match those in the actual config.

- onchain_observability_overrides: Struct containing the overrides

=== bitcoin_addr.conf

Configuration for bitcoin adapter.
Expand Down
9 changes: 0 additions & 9 deletions ic-os/guestos/rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -120,22 +120,13 @@ RUN addgroup ic-http-adapter && \
adduser --system --disabled-password --shell /usr/sbin/nologin -c "IC Canister HTTP Adapter" ic-http-adapter && \
adduser ic-http-adapter ic-http-adapter

# The "onchain-observability" account. Used to run `ic-onchain-observability-adapter` binary
# to send connectivity data to the observability canister.
RUN addgroup onchain-observability && \
adduser --system --disabled-password --shell /usr/sbin/nologin -c "IC Onchain Observability Adapter" onchain-observability && \
adduser onchain-observability onchain-observability && \
adduser onchain-observability ic-csp-vault-socket && \
adduser onchain-observability ic-registry-local-store

# User which will run the replica service.
RUN adduser --system --disabled-password --home /var/lib/ic --group --no-create-home ic-replica && \
adduser ic-replica backup && \
adduser ic-replica ic-csp-vault-socket && \
adduser ic-replica nonconfidential && \
adduser ic-replica ic-registry-local-store && \
adduser ic-replica ic-http-adapter && \
adduser ic-replica onchain-observability && \
adduser ic-replica vsock

# Accounts to allow remote access to state bits
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions ic-os/guestos/rootfs/etc/systemd/system/ic-replica.service
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ After=network-online.target
BindsTo=network-online.target
After=systemd-networkd.service
PartOf=systemd-networkd.service
# Set up a socket to serve gRPC requests to the onchain observability adapter
Wants=ic-onchain-observability-adapter.socket
StartLimitBurst=5
StartLimitIntervalSec=60

Expand All @@ -41,4 +39,3 @@ RestartSec=10

[Install]
WantedBy=multi-user.target
Also=ic-onchain-observability-adapter.socket
2 changes: 1 addition & 1 deletion ic-os/guestos/rootfs/opt/ic/bin/bootstrap-ic-node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ function process_bootstrap() {

# stash the following configuration files to config store
# note: keep this list in sync with configurations supported in build-bootstrap-config-image.sh
for FILE in journalbeat.conf network.conf nns.conf backup.conf log.conf malicious_behavior.conf bitcoind_addr.conf socks_proxy.conf onchain_observability_overrides.json; do
for FILE in journalbeat.conf network.conf nns.conf backup.conf log.conf malicious_behavior.conf bitcoind_addr.conf socks_proxy.conf; do
if [ -e "${TMPDIR}/${FILE}" ]; then
echo "Setting up ${FILE}"
cp "${TMPDIR}/${FILE}" "${CONFIG_ROOT}/${FILE}"
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion ic-os/guestos/rootfs/opt/ic/share/ic.json5.template
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@
// The canister http adapter socket file is: /ic-os/guestos/rootfs/etc/systemd/system/ic-https-outcalls-adapter.socket
https_outcalls_uds_path: "/run/ic-node/https-outcalls-adapter/socket",
https_outcalls_uds_metrics_path: "/run/ic-node/https-outcalls-adapter/metrics",
onchain_observability_uds_metrics_path: "/run/ic-node/onchain-observability-adapter/metrics",
},

// ==================================================
Expand Down
1 change: 0 additions & 1 deletion ic-os/guestos/rootfs/prep/ic-node/ic-node.fc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
/opt/ic/bin/replica -- gen_context(system_u:object_r:ic_replica_exec_t,s0)
/opt/ic/bin/ic-https-outcalls-adapter -- gen_context(system_u:object_r:ic_http_adapter_exec_t,s0)
/opt/ic/bin/canister_sandbox -- gen_context(system_u:object_r:ic_canister_sandbox_exec_t,s0)
/opt/ic/bin/ic_onchain_observability_adapter -- gen_context(system_u:object_r:ic_onchain_observability_adapter_exec_t,s0)
/var/lib/ic/backup(/.*)? gen_context(system_u:object_r:ic_data_t,s0)
/var/lib/ic/data(/.*)? gen_context(system_u:object_r:ic_data_t,s0)
/var/lib/ic/data/ic_state/page_deltas(/.*)? gen_context(system_u:object_r:ic_canister_mem_t,s0)
Expand Down
Loading

0 comments on commit 1bcf27e

Please sign in to comment.