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

Commit

Permalink
Update from snap-pluginsync 0.1.14
Browse files Browse the repository at this point in the history
  • Loading branch information
mkleina committed Sep 7, 2017
1 parent 50e7080 commit a2e016a
Show file tree
Hide file tree
Showing 16 changed files with 960 additions and 161 deletions.
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE.md
@@ -0,0 +1,34 @@
<!--
Thanks for filing an issue! Before hitting the button, give this a read.
If you are reporting a new issue, make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead.
If you suspect your issue is a bug, please add as much context as you can using the template below. If it is not a bug, remove any sections you don't need and explain how we can help.
As a basic rule, if you cannot provide enough information to continue addressing the issue within 7 days, a maintainer will close it. We will, however, reopen it if you later provide the information. Thanks again.
-->

**Snap daemon version** (use `snapteld -v`):

**Environment**:
- **Cloud provider or hardware configuration**:
- **OS** (e.g. from /etc/os-release):
- **Kernel** (e.g. `uname -a`):
- **Relevant tools** (e.g. plugins used with Snap):
- **Others** (e.g. deploying with Ansible):


**What happened**:


**What you expected to happen**:


**Steps to reproduce it** (as minimally and precisely as possible):

1.
2.
3.


**Anything else do we need to know** (e.g. issue happens only occasionally):
21 changes: 21 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,21 @@
<!--
If this is a bug fix, make sure your description includes "fixes #xxxx", or
"closes #xxxx"
Please provide the following information:
-->
Fixes #

Summary of changes:
-
-
-

How to verify it:
-

Testing done:
-

A picture of a snapping turtle (not required but encouraged):
-
21 changes: 12 additions & 9 deletions .gitignore
@@ -1,3 +1,9 @@
# File managed by pluginsync
#
# NOTE: please commit OS/Editor specific settings in your .gitignore_global
# .idea
# .DS_Store
#
# Compiled Object files, Static and Dynamic libs (Shared Objects)
*.o
*.a
Expand All @@ -21,18 +27,15 @@ _testmain.go

*.exe
*.test
.idea
tmp/
*.tmp
scratch/
build/
*.swp
*.prof

# Output of the go coverage tool
*.out
profile.cov
gin-bin

# we don't vendor godep _workspace
**/Godeps/_workspace/**
vendor/

# OSX stuff
.DS_Store
# ignore build artifacts
build/
22 changes: 22 additions & 0 deletions .pluginsync.yml
@@ -0,0 +1,22 @@
# File managed by pluginsync
pluginsync_config: '0.1.14'
managed_files:
- .github
- .github/ISSUE_TEMPLATE.md
- .github/PULL_REQUEST_TEMPLATE.md
- .gitignore
- .pluginsync.yml
- .travis.yml
- CONTRIBUTING.md
- LICENSE
- Makefile
- scripts
- scripts/build.sh
- scripts/common.sh
- scripts/deps.sh
- scripts/large.sh
- scripts/pre_deploy.sh
- scripts/test
- scripts/test/large_spec.rb
- scripts/test/spec_helper.rb
- scripts/test.sh
71 changes: 56 additions & 15 deletions .travis.yml
@@ -1,26 +1,67 @@
sudo: required
services:
- docker
# File managed by pluginsync
sudo: false
language: go
go:
- 1.6.3
- 1.7.3
before_install:
- go get github.com/tools/godep
- if [ ! -d $SNAP_PLUGIN_SOURCE ]; then mkdir -p $HOME/gopath/src/github.com/intelsdi-x; ln -s $TRAVIS_BUILD_DIR $SNAP_PLUGIN_SOURCE; fi # CI for forks not from intelsdi-x
- 1.7.x
- 1.8.x
env:
global:
- SNAP_PLUGIN_SOURCE=/home/travis/gopath/src/github.com/intelsdi-x/snap-plugin-collector-cgroups
- ORG_PATH=/home/travis/gopath/src/github.com/intelsdi-x
- SNAP_PLUGIN_SOURCE=/home/travis/gopath/src/github.com/${TRAVIS_REPO_SLUG}
- GLIDE_HOME="${HOME}/.glide"
matrix:
- TEST=unit
- TEST=integration
- TEST_TYPE=small
- TEST_TYPE: build
matrix:
exclude:
- go: 1.7.x
env: TEST_TYPE=build
before_install:
- "[[ -d $SNAP_PLUGIN_SOURCE ]] || mkdir -p $ORG_PATH && ln -s $TRAVIS_BUILD_DIR $SNAP_PLUGIN_SOURCE"
install:
- export TMPDIR=$HOME/tmp
- mkdir -p $TMPDIR
- cd $SNAP_PLUGIN_SOURCE # change dir into source
- cd $SNAP_PLUGIN_SOURCE
- make deps
script:
- make check TEST=$TEST 2>&1 # Run test suite
- make check 2>&1
notifications:
email: false
slack:
secure: VkbZLIc2RH8yf3PtIAxUNPdAu3rQQ7yQx0GcK124JhbEnZGaHyK615V0rbG7HcVmYKGPdB0cXqZiLBDKGqGKb2zR1NepOe1nF03jxGSpPq8jIFeEXSJGEYGL34ScDzZZGuG6qwbjFcXiW5lqn6t8igzp7v2+URYBaZo5ktCS2xY=
before_deploy:
- "./scripts/pre_deploy.sh"
deploy:
- provider: s3
access_key_id: $AWS_ACCESS_KEY_ID
secret_access_key: $AWS_SECRET_ACCESS_KEY
bucket: snap.ci.snap-telemetry.io
region: us-west-2
skip_cleanup: true
local-dir: s3
upload-dir: plugins
acl: public_read
on:
repo: intelsdi-x/snap-plugin-collector-cgroups
branch: master
condition: $TEST_TYPE = "build" && $TRAVIS_GO_VERSION =~ ^1\.8(|\.[0-9]+)$
- provider: s3
access_key_id: $AWS_ACCESS_KEY_ID
secret_access_key: $AWS_SECRET_ACCESS_KEY
bucket: snap.ci.snap-telemetry.io
region: us-west-2
skip_cleanup: true
local-dir: s3
upload-dir: plugins
acl: public_read
on:
repo: intelsdi-x/snap-plugin-collector-cgroups
tags: true
condition: $TEST_TYPE = "build" && $TRAVIS_GO_VERSION =~ ^1\.8(|\.[0-9]+)$
- provider: releases
api_key: $GITHUB_API_KEY
file:
- release/snap-plugin-collector-cgroups_linux_x86_64
skip_cleanup: true
on:
repo: intelsdi-x/snap-plugin-collector-cgroups
tags: true
condition: $TEST_TYPE = "build" && $TRAVIS_GO_VERSION =~ ^1\.8(|\.[0-9]+)$
45 changes: 27 additions & 18 deletions CONTRIBUTING.md
@@ -1,47 +1,56 @@
# snap collector plugin - cgroups
# snap plugin collector cgroups

1. [Contributing Code](#contributing-code)
2. [Contributing Examples](#contributing-examples)
3. [Contribute Elsewhere](#contribute-elsewhere)
4. [Thank You](#thank-you)
4. [Reporting Security Issues](#reporting-security-issues)
5. [Thank You](#thank-you)

This repository has dedicated developers from Intel working on updates. The most helpful way to contribute is by reporting your experience through issues. Issues may not be updated while we review internally, but they're still incredibly appreciated.
This repository is primarily **community supported**. We both appreciate and need your contribution to keep it stable. Thank you for being part of the community! We love you for it.

## Contributing Code
**_IMPORTANT_**: We encourage contributions to the project from the community. We ask that you keep the following guidelines in mind when planning your contribution.

* Whether your contribution is for a bug fix or a feature request, **create an [Issue](https://github.com/intelsdi-x/snap-plugin-collector-cgroups/issues)** and let us know what you are thinking.
* **For bugs**, if you have already found a fix, feel free to submit a Pull Request referencing the Issue you created.
* **For feature requests**, we want to improve upon the library incrementally which means small changes at a time. In order ensure your PR can be reviewed in a timely manner, please keep PRs small, e.g. <10 files and <500 lines changed. If you think this is unrealistic, then mention that within the issue and we can discuss it.
* **For bugs**, if you have already found a fix, feel free to submit a Pull Request referencing the Issue you created. Include the `Fixes #` syntax to link it to the issue you're addressing.
* **For feature requests**, we want to improve upon the library incrementally which means small changes at a time. In order to ensure your PR can be reviewed in a timely manner, please keep PRs small, e.g. <10 files and <500 lines changed. If you think this is unrealistic, then mention that within the issue and we can discuss it.

Once you're ready to contribute code back to this repo, start with these steps:

* Fork the appropriate sub-projects that are affected by your change.
* Clone the fork to `$GOPATH/src/github.com/intelsdi-x/`:

```
$ git clone https://github.com/<yourGithubID>/<project>.git
```
```
$ cd "${GOPATH}/src/github.com/intelsdi-x/"
$ git clone https://github.com/intelsdi-x/snap-plugin-collector-cgroups.git
```
* Create a topic branch for your change and checkout that branch:

```
$ git checkout -b some-topic-branch
```
* Make your changes and run the test suite if one is provided.
```
$ git checkout -b some-topic-branch
```
* Make your changes to the code and add tests to cover contributed code.
* Validate the changes and run the test suite if one is provided.
* Commit your changes and push them to your fork.
* Open a pull request for the appropriate project.
* Contributors will review your pull request, suggest changes, and merge it when it’s ready and/or offer feedback.
* To report a bug or issue, please open a new issue against this repository.

If you have questions feel free to contact the [maintainers](https://github.com/intelsdi-x/snap/blob/master/README.md#maintainers) by tagging them: @intelsdi-x/plugin-maintainers.
If you have questions feel free to contact the [maintainers](https://github.com/intelsdi-x/snap/blob/master/docs/MAINTAINERS.md).

## Contributing Examples
The most immediately helpful way you can benefit this project is by cloning the repository, adding some further examples and submitting a pull request.

Have you written a blog post about how you use [Snap](http://github.com/intelsdi-x/snap) and/or this plugin? Share it with us!
Have you written a blog post about how you use [Snap](http://github.com/intelsdi-x/snap) and/or this plugin? Send it to us [on Slack](http://slack.snap-telemetry.io)!

## Contribute Elsewhere
This repository is one of **many** plugins in **Snap**, the open telemetry framework. See the full project at http://github.com/intelsdi-x/snap.
This repository is one of **many** plugins in **Snap**, a powerful telemetry framework. See the full project at http://snap-telemetry.io


## Reporting Security Issues

The Snap team take security very seriously. If you have any issue regarding security,
please notify us by sending an email to snap-security@intel.com and not by creating a GitHub issue.
We will follow up with you promptly with more information and a plan for remediation.
While we are not offering a security bounty, we would love to send some Snap swag your way along with our
deepest gratitude for your assistance in making Snap a more secure product.

## Thank You
And **thank you!** Your contribution, through code and participation, is incredibly important to us.
25 changes: 0 additions & 25 deletions LICENSE
Expand Up @@ -175,28 +175,3 @@
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
36 changes: 33 additions & 3 deletions Makefile
@@ -1,11 +1,41 @@
# File managed by pluginsync
# http://www.apache.org/licenses/LICENSE-2.0.txt
#
#
# Copyright 2015 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

default:
$(MAKE) deps
$(MAKE) all
deps:
bash -c "godep restore"
bash -c "./scripts/deps.sh"
test:
bash -c "./scripts/test.sh $(TEST)"
bash -c "./scripts/test.sh $(TEST_TYPE)"
test-legacy:
bash -c "./scripts/test.sh legacy"
test-small:
bash -c "./scripts/test.sh small"
test-medium:
bash -c "./scripts/test.sh medium"
test-large:
bash -c "./scripts/test.sh large"
test-all:
$(MAKE) test-small
$(MAKE) test-medium
$(MAKE) test-large
check:
$(MAKE) test
all:
bash -c "./scripts/build.sh $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))"
bash -c "./scripts/build.sh"

0 comments on commit a2e016a

Please sign in to comment.