Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Commit

Permalink
Rename master - main (#160)
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuriy authored Oct 18, 2021
1 parent 59ee613 commit f19e937
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .ci/jobs/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
parameters:
- string:
name: branch_specifier
default: master
default: main
description: the Git branch specifier to build (<branchName>, <tagName>,
<commitId>, etc.)
properties:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
---
- job:
name: elastic+ansible-beats+master
display-name: elastic / ansible-beats - master
description: Master branch testing with test kitchen
name: elastic+ansible-beats+main
display-name: elastic / ansible-beats - main
description: Main branch testing with test kitchen
scm:
- git:
branches:
- refs/heads/main
triggers:
- timed: H H(02-04) * * *
builders:
Expand Down
2 changes: 1 addition & 1 deletion .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Issues that do not follow these guidelines are likely to be closed.

**Beats version**

**Role version**: (If using master please specify github sha)
**Role version**: (If using main please specify github sha)

**OS version** (`uname -a` if on a Unix-like system):

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ansible-beats
[![Build Status](https://img.shields.io/jenkins/s/https/devops-ci.elastic.co/job/elastic+ansible-beats+master.svg)](https://devops-ci.elastic.co/job/elastic+ansible-beats+master/)
[![Build Status](https://img.shields.io/jenkins/s/https/devops-ci.elastic.co/job/elastic+ansible-beats+main.svg)](https://devops-ci.elastic.co/job/elastic+ansible-beats+main/)
[![Ansible Galaxy](https://img.shields.io/badge/ansible--galaxy-elastic.beats-blue.svg)](https://galaxy.ansible.com/elastic/beats/)

This role provides a generic means of installing Elastic supported Beats
Expand Down Expand Up @@ -59,8 +59,8 @@ The simplest configuration therefore consists of:
The above installs Filebeat 7.15.1 on the hosts 'localhost'.
**Notes**:
- Beats default version is described in [`beats_version`](https://github.com/elastic/ansible-beats/blob/master/defaults/main.yml#L4). You can override this variable in your playbook to install another version.
While we are testing this role only with one 7.x and one 6.x version (respectively [7.15.1](https://github.com/elastic/ansible-beats/blob/master/defaults/main.yml#L4) and [6.8.18](https://github.com/elastic/ansible-beats/blob/master/test/integration/standard-6x.yml#L7) at the time of writing), this role should work with others version also in most cases.
- Beats default version is described in [`beats_version`](https://github.com/elastic/ansible-beats/blob/main/defaults/main.yml#L4). You can override this variable in your playbook to install another version.
While we are testing this role only with one 7.x and one 6.x version (respectively [7.15.1](https://github.com/elastic/ansible-beats/blob/main/defaults/main.yml#L4) and [6.8.18](https://github.com/elastic/ansible-beats/blob/main/test/integration/standard-6x.yml#L7) at the time of writing), this role should work with others version also in most cases.
- Beat product is described in `beat` variable. While currently tested Beats are Filebeat, Metricbeat & Packetbeat, this role should work also with other member of [The Beats Family](https://www.elastic.co/products/beats) in most cases.

## Testing
Expand Down

0 comments on commit f19e937

Please sign in to comment.