Skip to content

Commit

Permalink
TOOLS-2574 Purge dependency on us-east.manta.joyent.com name (#17)
Browse files Browse the repository at this point in the history
Reviewed by: Dan McDonald <danmcd@mnx.io>
  • Loading branch information
bahamat committed Apr 24, 2024
1 parent 6ea9269 commit e6c6b1e
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 55 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
@@ -1,12 +1,12 @@
[submodule "deps/sdc-scripts"]
path = deps/sdc-scripts
url = https://github.com/joyent/sdc-scripts
url = https://github.com/TritonDataCenter/sdc-scripts
[submodule "deps/nginx"]
path = deps/nginx
url = https://github.com/nginx/nginx
[submodule "deps/grafana"]
path = deps/grafana
url = https://github.com/joyent/grafana
url = https://github.com/TritonDataCenter/grafana
[submodule "deps/eng"]
path = deps/eng
url = https://github.com/joyent/eng.git
url = https://github.com/TritonDataCenter/eng.git
17 changes: 9 additions & 8 deletions CONTRIBUTING.md
Expand Up @@ -6,6 +6,7 @@

<!--
Copyright 2019 Joyent, Inc.
Copyright 2024 MNX Cloud, Inc.
-->

# Triton Contribution Guidelines
Expand All @@ -23,10 +24,10 @@ If you're making a substantial change, you probably want to contact developers
with the contribution process, please feel free to contact developers [on the
mailing list or IRC](README.md#community). Note that larger Triton project
changes are typically designed and discussed via ["Requests for Discussion
(RFDs)"](https://github.com/joyent/rfd).
(RFDs)"](https://github.com/TritonDataCenter/rfd).

Triton repositories use the [Joyent Engineering
Guidelines](https://github.com/joyent/eng/blob/master/docs/index.md). Notably:
Triton repositories use the [Triton Engineering
Guidelines](https://github.com/TritonDataCenter/eng/blob/master/docs/index.md). Notably:

* The #master branch should be first-customer-ship (FCS) quality at all times.
Don't push anything until it's tested.
Expand All @@ -38,18 +39,18 @@ Guidelines](https://github.com/joyent/eng/blob/master/docs/index.md). Notably:

There are two separate issue trackers that are relevant for Triton code:

- An internal-to-Joyent JIRA instance.
- An internal JIRA instance.

A JIRA ticket has an ID like `IMGAPI-536`, where "IMGAPI" is the JIRA project
name -- in this case used by the
[sdc-imgapi](https://github.com/joyent/sdc-imgapi) and related repos. A
[sdc-imgapi](https://github.com/TritonDataCenter/sdc-imgapi) and related repos. A
read-only view of most JIRA tickets is made available at
<https://smartos.org/bugview/> (e.g.
<https://smartos.org/bugview/IMGAPI-536>).

- GitHub issues for the relevant repo, e.g.
<https://github.com/joyent/triton/issues>.
<https://github.com/TritonDataCenter/triton/issues>.

Before Triton was open sourced, Joyent engineering used a private JIRA instance.
While Joyent continues to use JIRA internally, we also use GitHub issues for
Before Triton was open sourced, Triton engineering used a private JIRA instance.
While we continue to use JIRA internally, we also use GitHub issues for
tracking -- primarily to allow interaction with those without access to JIRA.
26 changes: 14 additions & 12 deletions README.md
Expand Up @@ -6,29 +6,31 @@

<!--
Copyright 2019 Joyent, Inc.
Copyright 2024 MNX Cloud, Inc.
-->

# triton-grafana

The Triton core grafana service. Triton uses
[Prometheus](https://github.com/joyent/triton-prometheus) and
[Prometheus](https://github.com/TritonDataCenter/triton-prometheus) and
Grafana to track its own metrics and monitor itself, as well as Manta. All
metrics are gathered via [CMON](https://github.com/joyent/triton-cmon).
metrics are gathered via [CMON](https://github.com/TritonDataCenter/triton-cmon).

(This repository is part of the Joyent Triton project. For general documentation
see the main [Triton project](https://github.com/joyent/triton) page.)
(This repository is part of the Triton Data Center project. For general
documentation see the main [Triton project](https://github.com/TritonDataCenter/triton)
page.)

## Status

Joyent is actively developing Prometheus and Grafana services for use in Triton
and Manta. [RFD 150](https://github.com/joyent/rfd/tree/master/rfd/0150)
We are actively developing Prometheus and Grafana services for use in Triton
and Manta. [RFD 150](https://github.com/TritonDataCenter/rfd/tree/master/rfd/0150)
describes the current plan and status.

## Setup

Grafana requires either a Triton or Manta Prometheus instance to exist, and will
also function with both simultaneously. Ensure that
[Prometheus](https://github.com/joyent/triton-prometheus) is set up in your
[Prometheus](https://github.com/TritonDataCenter/triton-prometheus) is set up in your
Triton and/or Manta deployment -- see the triton-prometheus README for
Prometheus deployment instructions.

Expand All @@ -53,7 +55,7 @@ SMF service.
- A Grafana instance runs the "grafana" SMF service.

- A BIND server runs on localhost and forwards DNS lookups to the Triton and
Manta [binder](https://github.com/joyent/binder) resolvers.
Manta [binder](https://github.com/TritonDataCenter/binder) resolvers.

### Nginx

Expand All @@ -73,7 +75,7 @@ directory.
### graf-proxy

The graf-proxy performs authentication against the Triton deployment's
[UFDS](https://github.com/joyent/sdc-ufds) instance. Upon successful
[UFDS](https://github.com/TritonDataCenter/sdc-ufds) instance. Upon successful
authentication via HTTP basic auth, graf-proxy sets triton-grafana-specific HTTP
headers in its response to Nginx. Nginx then forwards authenticated requests to
the Grafana instance.
Expand Down Expand Up @@ -120,7 +122,7 @@ on values from SAPI.
Grafana is currently the only Triton service that must perform resolution of
Manta DNS names -- specifically, the DNS names of the Manta Prometheus
instances. Thus, Grafana must know the IP addresses of the Manta
[binder](https://github.com/joyent/binder) resolvers. It is not sufficient to
[binder](https://github.com/TritonDataCenter/binder) resolvers. It is not sufficient to
place these resolvers in `/etc/resolv.conf`, because there could be an
arbitrary number of binder instances across Triton and Manta.

Expand All @@ -129,9 +131,9 @@ Triton and Manta binder resolvers as appropriate. The BIND server runs on
localhost, and localhost is the only entry in `/etc/resolv.conf`.

Any changes in the set of Manta resolvers cannot be detected by
[config-agent](https://github.com/joyent/sdc-config-agent), because Grafana
[config-agent](https://github.com/TritonDataCenter/sdc-config-agent), because Grafana
is not deployed under the "manta"
[SAPI](https://github.com/joyent/sdc-sapi) application. However, Grafana can
[SAPI](https://github.com/TritonDataCenter/sdc-sapi) application. However, Grafana can
still query SAPI for the set of Manta resolvers.

This image thus runs a cron job, `bin/update-named.sh`, that checks for changes
Expand Down
2 changes: 1 addition & 1 deletion deps/sdc-scripts
Submodule sdc-scripts updated 1 files
+3 −3 README.md
60 changes: 30 additions & 30 deletions package.json
@@ -1,32 +1,32 @@
{
"name": "triton-grafana",
"description": "Grafana for TritonDC",
"version": "1.0.1",
"author": "Joyent (joyent.com)",
"private": true,
"repository": {
"type": "git",
"url": "git+https://github.com/joyent/triton-grafana.git"
},
"license": "MPL-2.0",
"engines": {
"node" : ">=6.x"
},
"dependencies": {
"assert-plus": "^1.0.0",
"basic-auth": "^2.0.1",
"bunyan": "^1.8.12",
"restify": "^7.2.1",
"restify-clients": "^2.6.3",
"restify-errors": "^6.1.1",
"@smaller/tap": "^11.1.4-1.0.0",
"triton-audit-logger": "^1.0.1",
"ufds": "^1.4.0",
"uuid": "^3.3.2",
"vasync": "^2.2.0"
},
"devDependencies": {
"eslint": "^4.13.1",
"eslint-plugin-joyent": "~2.1.0"
}
"name": "triton-grafana",
"description": "Grafana for TritonDC",
"version": "1.0.2",
"author": "Joyent (joyent.com)",
"private": true,
"repository": {
"type": "git",
"url": "git+https://github.com/TritonDataCenter/triton-grafana.git"
},
"license": "MPL-2.0",
"engines": {
"node": ">=6.x"
},
"dependencies": {
"assert-plus": "^1.0.0",
"basic-auth": "^2.0.1",
"bunyan": "^1.8.12",
"restify": "^7.2.1",
"restify-clients": "^2.6.3",
"restify-errors": "^6.1.1",
"@smaller/tap": "^11.1.4-1.0.0",
"triton-audit-logger": "^1.0.1",
"ufds": "^1.4.0",
"uuid": "^3.3.2",
"vasync": "^2.2.0"
},
"devDependencies": {
"eslint": "^4.13.1",
"eslint-plugin-joyent": "~2.1.0"
}
}

0 comments on commit e6c6b1e

Please sign in to comment.