This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fluo-muchos.git
The following commit(s) were added to refs/heads/main by this push:
new d93b034 Update links to point to main branch (#367)
d93b034 is described below
commit d93b03498938b804e7153ea8d3aa3d8a6cdf2095
Author: Christopher Tubbs <[email protected]>
AuthorDate: Fri Aug 14 08:01:54 2020 -0400
Update links to point to main branch (#367)
---
CONTRIBUTING.md | 4 ++--
README.md | 12 ++++++------
ansible/roles/grafana/tasks/main.yml | 4 ++--
ansible/roles/influxdb/tasks/main.yml | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8a8b06b..4154f43 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,12 +32,12 @@ The following command runs the unit tests:
## Before you submit a PR
-If you are modifying any of the Python code in this project, please use
[Black](https://github.com/psf/black) to enforce that Python code found under
the [lib](https://github.com/apache/fluo-muchos/tree/master/lib) folder is
formatted correctly. Before submitting a PR, please ensure that you have used
Black to format the code with max line length set to 79 as below (it is to be
run from the repo root):
+If you are modifying any of the Python code in this project, please use
[Black](https://github.com/psf/black) to enforce that Python code found under
the [lib](https://github.com/apache/fluo-muchos/tree/main/lib) folder is
formatted correctly. Before submitting a PR, please ensure that you have used
Black to format the code with max line length set to 79 as below (it is to be
run from the repo root):
```
black lib --line-length 79
```
-The [CI](https://github.com/apache/fluo-muchos/tree/master/.travis.yml) for
this project runs tools to detect common coding issues with Python and Ansible
files. Rather than wait for the CI to flag any issues with your work, please
run the
[cibuild](https://github.com/apache/fluo-muchos/tree/master/scripts/cibuild.sh)
script on your dev machine, which in turn runs the following tools:
+The [CI](https://github.com/apache/fluo-muchos/tree/main/.travis.yml) for this
project runs tools to detect common coding issues with Python and Ansible
files. Rather than wait for the CI to flag any issues with your work, please
run the
[cibuild](https://github.com/apache/fluo-muchos/tree/main/scripts/cibuild.sh)
script on your dev machine, which in turn runs the following tools:
- [flake8](https://github.com/pycqa/flake8) to validate that the Python code
in the project conforms to known good practices.
- [Ansible-lint](https://github.com/ansible/ansible-lint/) prior to submitting
a PR. This will ensure that you align with known good practices. Please also
review the guidance on [false
positives](https://docs.ansible.com/ansible-lint/rules/rules.html#false-positives-skipping-rules)
from Ansible-lint.
diff --git a/README.md b/README.md
index 3265c24..f84113e 100644
--- a/README.md
+++ b/README.md
@@ -365,17 +365,17 @@ Muchos is powered by the following projects:
[awscli-config]:
http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#cli-quick-configuration
[azure-cli]: https://docs.microsoft.com/en-us/cli/azure/?view=azure-cli-latest
[ansible-azure]:
https://docs.ansible.com/ansible/latest/scenario_guides/guide_azure.html
-[fluo-app]: https://github.com/apache/fluo/blob/master/docs/applications.md
-[WebIndex]: https://github.com/apache/fluo-examples/tree/master/webindex
-[Phrasecount]: https://github.com/apache/fluo-examples/tree/master/phrasecount
-[Stresso]: https://github.com/apache/fluo-examples/tree/master/stresso
+[fluo-app]: https://github.com/apache/fluo/blob/main/docs/applications.md
+[WebIndex]: https://github.com/apache/fluo-examples/tree/main/webindex
+[Phrasecount]: https://github.com/apache/fluo-examples/tree/main/phrasecount
+[Stresso]: https://github.com/apache/fluo-examples/tree/main/stresso
[boto]: http://boto.cloudhackers.com/en/latest/
[boto3]: https://github.com/boto/boto3
[Ansible]: https://www.ansible.com/
-[ti]: https://travis-ci.org/apache/fluo-muchos.svg?branch=master
+[ti]: https://travis-ci.org/apache/fluo-muchos.svg?branch=main
[tl]: https://travis-ci.org/apache/fluo-muchos
[li]: http://img.shields.io/badge/license-ASL-blue.svg
-[ll]: https://github.com/apache/fluo-muchos/blob/master/LICENSE
+[ll]: https://github.com/apache/fluo-muchos/blob/main/LICENSE
[logo]: contrib/muchos-logo.png
[mc]: https://github.com/mikewalch/muchos-custom
[fluo]: http://fluo.apache.org/
diff --git a/ansible/roles/grafana/tasks/main.yml
b/ansible/roles/grafana/tasks/main.yml
index cfce62c..55a02cc 100644
--- a/ansible/roles/grafana/tasks/main.yml
+++ b/ansible/roles/grafana/tasks/main.yml
@@ -31,12 +31,12 @@
- name: "add cluster dashboard configuration"
template: src=cluster-dashboard.json
dest=/etc/grafana/dashboards/cluster-dashboard.json owner=grafana group=grafana
- name: "configure fluo dashboards"
- get_url:
url=https://raw.githubusercontent.com/apache/fluo/master/contrib/grafana/{{
item }} dest=/etc/grafana/dashboards/{{ item }}
+ get_url:
url=https://raw.githubusercontent.com/apache/fluo/main/contrib/grafana/{{ item
}} dest=/etc/grafana/dashboards/{{ item }}
with_items:
- fluo-recent-dashboard.json
- fluo-historical-dashboard.json
- name: "configure accumulo dashboards"
- get_url:
url=https://raw.githubusercontent.com/apache/fluo-uno/master/plugins/influx-metrics/accumulo-dashboard.json
dest=/etc/grafana/dashboards/accumulo-dashboard.json
+ get_url:
url=https://raw.githubusercontent.com/apache/fluo-uno/main/plugins/influx-metrics/accumulo-dashboard.json
dest=/etc/grafana/dashboards/accumulo-dashboard.json
- name: "ensure owner and group are correct for /etc/grafana"
file: path=/etc/grafana/ recurse=yes owner=grafana group=grafana
- name: "ensure grafana is running (and enable it at boot)"
diff --git a/ansible/roles/influxdb/tasks/main.yml
b/ansible/roles/influxdb/tasks/main.yml
index 0cc4eac..1ab35f5 100644
--- a/ansible/roles/influxdb/tasks/main.yml
+++ b/ansible/roles/influxdb/tasks/main.yml
@@ -30,7 +30,7 @@
- restart influxdb
- setup influxdb
- name: "download fluo setup"
- get_url:
url=https://raw.githubusercontent.com/apache/fluo/master/contrib/influxdb/fluo_metrics_setup.txt
dest=/etc/opt/influxdb/fluo_metrics_setup.txt
+ get_url:
url=https://raw.githubusercontent.com/apache/fluo/main/contrib/influxdb/fluo_metrics_setup.txt
dest=/etc/opt/influxdb/fluo_metrics_setup.txt
- name: "create data dir"
file: path={{ default_data_dirs[0] }}/influxdb state=directory
owner=influxdb group=influxdb
- name: "ensure influxdb is running (and enable it at boot)"
