Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add default kapacitor.conf locations #2782

Merged
merged 2 commits into from
Jun 25, 2021

Conversation

sanderson
Copy link
Collaborator

Closes #2779

  • Tests pass (no build errors)
  • Rebased/mergeable

@sanderson sanderson merged commit d37000a into kapacitor-1.6.0 Jun 25, 2021
@sanderson sanderson deleted the kapacitor-config-location branch June 25, 2021 14:45
sanderson added a commit that referenced this pull request Jun 28, 2021
* base changes and cleanup for kapa 1.6

* Kapacitor 1.6.0 jstirnaman (#2684)

* update: add kapacitor/v1/users to API doc (#2617).

* fix: spelling

* update: cleanup user API.

* Apply suggestions from code review

Co-authored-by: Scott Anderson <sanderson@users.noreply.github.com>

* Update content/kapacitor/v1.6/working/api.md

* Update content/kapacitor/v1.6/working/api.md

Co-authored-by: Scott Anderson <sanderson@users.noreply.github.com>

* Kapacitor 1.6.0 release notes (#2682)

* Fix headings in Kapacitor release notes
* Add 1.6.0 release notes


Co-authored-by: Scott Anderson <sanderson@users.noreply.github.com>

* Kapacitor Flux tasks (#2687)

* kapacitor flux task setup

* added crud docs for kapacitor flux tasks

* added kapacitor flux task cli commands

* Apply suggestions from code review

Co-authored-by: pierwill <19642016+pierwill@users.noreply.github.com>

* Update content/kapacitor/v1.6/working/flux/_index.md

Co-authored-by: pierwill <19642016+pierwill@users.noreply.github.com>

* Kapacitor TrickleNode (#2694)

* closes #2691

* WIP TrickleNode

* add Trickle chaining methods

* remove unused back-to-top links in kapacitor docs

* Kapacitor 1.6 new configuration settings (#2693)

* kapacitor config doc cleanup

* updated heading and links

* added new kapacitor 1.6 config options, closes #2616, closes #2609

* updated slack instructions

* Kapacitor Zenoss event handler (#2695)

* added zenoss event handler to kapacitor, closes #2271

* updated descriptions and removed defaults from zenoss event handler

* updated kapacitor release notes

* Updated Kapacitor Kafka event handler partitioning options (#2697)

* updated kafka partitioning behavior, closes #2263

* fixed typos in kapacitor kafka content

* Apply suggestions from code review

Co-authored-by: pierwill <19642016+pierwill@users.noreply.github.com>

Co-authored-by: pierwill <19642016+pierwill@users.noreply.github.com>

* added kafka link to release notes

* Kapacitor API updates (#2718)

* clean up kapacitor api headings

* add flux task api endpoints to kapacitor api doc

* Kapacitor authorization and authentication (#2717)

* ported and revamped kapacitor authentication content, closes #2690

* Apply suggestions from code review

Co-authored-by: Jason Stirnaman <jstirnaman@influxdata.com>

* updated comment in kapacitor auth example

* Apply suggestions from code review

Co-authored-by: kelseiv <47797004+kelseiv@users.noreply.github.com>

Co-authored-by: Jason Stirnaman <jstirnaman@influxdata.com>
Co-authored-by: kelseiv <47797004+kelseiv@users.noreply.github.com>

* updated edge.js

* Add default kapacitor.conf locations (#2782)

* added default kapacitor config locations, closes #2779

* Apply suggestions from code review

* updated data for kapacitor 1.6.0 changelog

Co-authored-by: Jason Stirnaman <jstirnaman@influxdata.com>
Co-authored-by: pierwill <19642016+pierwill@users.noreply.github.com>
Co-authored-by: kelseiv <47797004+kelseiv@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant