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 elasticsearch as annotations source #403

Closed
wants to merge 5 commits into from

Conversation

kamaradclimber
Copy link
Contributor

Support for elasticsearch as annotation source.
Current feature:

  • allow to search against any index ("toto", "_all", "toto,titi")
  • allow any query (using query_string syntax)

Limitation: cannot use the classic "logstash" index name pattern since the index is fixed.
I probably won't fix it in this PR since people can use aliases in the beginning

Fix #201

@torkelo
Copy link
Member

torkelo commented May 9, 2014

Nice! will try to find time to check this out

@kamaradclimber
Copy link
Contributor Author

Hi @torkelo ,

do you need some modification about this change ?

@torkelo
Copy link
Member

torkelo commented May 26, 2014

No, just time to try it out. Maybe in the next couple of days.

@torkelo
Copy link
Member

torkelo commented May 29, 2014

Please sign the contributor license agreement http://grafana.org/docs/contributing/cla.html

@blalor
Copy link

blalor commented Jul 10, 2014

Any further progress on this? Sounds like a great addition.

@kamaradclimber
Copy link
Contributor Author

I am stuck in discussions about the CLA with my company. We've signed CLA before, but the patent related part seems out of question. I'll try to make some progress today

@kamaradclimber
Copy link
Contributor Author

rebased against master

Experimental support for elasticsearch as annotation source.
Current feature:
- allow to search against any index ("toto", "_all", "toto,titi")
- allow any query

Limitations:
- static fields used for timestamp and annotation message
- size of request is hard-coded
- direct use of $http instead of elasticsearch ejs client
- no tests

Fix grafana#201
@steve-dave
Copy link
Contributor

@kamaradclimber the patent license is only in regards to code you actually contribute AFAIK, is that a problem if you are willingly submitting the code? I'm just interested in why your company has taken issue with it.

@sciurus
Copy link

sciurus commented Jul 17, 2014

How well should this work with events stored in elasticsearch via anthracite?

@kamaradclimber
Copy link
Contributor Author

CLA signed (finally!)
@torkelo do you need something before merging this PR?

@torkelo
Copy link
Member

torkelo commented Jul 18, 2014

Great.

- allow to configure timestamp field
- allow to configure message field
- allow to configure fetched events
@kamaradclimber
Copy link
Contributor Author

@sciurus I have pushed a few addition to make fields used for research configurable. Can you tell me if it is sufficient?

@torkelo torkelo added this to the v1.7 milestone Jul 19, 2014
@torkelo torkelo closed this Jul 30, 2014
Dieterbe pushed a commit to Dieterbe/grafana that referenced this pull request Aug 11, 2015
@ying-jeanne ying-jeanne added the pr/external This PR is from external contributor label Apr 30, 2021
IevaVasiljeva pushed a commit that referenced this pull request Jul 14, 2022
* Fix: Choose Lookup params per auth module

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: Prefer pointer to struct in lookup

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: user email for ldap

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: Use only login for lookup in LDAP

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: use user email for ldap

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

fix remaining test

fix nit picks

(cherry picked from commit 09ca54d4665583b5648fea5726a19e0b58df4ec0)

* fix integration tests

(cherry picked from commit 16c3077bb39f41acacbef4b13c65c7c907c54de7)

* Release: Bump version to 8.3.9 (#403)

* Change bump-version.yml

* "Release: Updated versions in package to 8.3.9"

Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>

* Update yarn.lock

Co-authored-by: jguer <joao.guerreiro@grafana.com>
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
kminehart added a commit that referenced this pull request Jul 15, 2022
* Fix XSS in runbook URL (#383)

* "Release: Updated versions in package to 8.3.8" (#385)

* Fix: Choose Lookup params per auth module v8.3.x (#401)

* Fix: Choose Lookup params per auth module

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: Prefer pointer to struct in lookup

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: user email for ldap

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: Use only login for lookup in LDAP

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: use user email for ldap

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

fix remaining test

fix nit picks

* update lock

* fix integration tests

* [v8.3.x] Merge 'release-8.3.9` branch (#404)

* Fix: Choose Lookup params per auth module

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: Prefer pointer to struct in lookup

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: user email for ldap

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: Use only login for lookup in LDAP

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: use user email for ldap

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

fix remaining test

fix nit picks

(cherry picked from commit 09ca54d4665583b5648fea5726a19e0b58df4ec0)

* fix integration tests

(cherry picked from commit 16c3077bb39f41acacbef4b13c65c7c907c54de7)

* Release: Bump version to 8.3.9 (#403)

* Change bump-version.yml

* "Release: Updated versions in package to 8.3.9"

Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>

* Update yarn.lock

Co-authored-by: jguer <joao.guerreiro@grafana.com>
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>

* "Release: Updated versions in package to 8.3.10" (#409)

* Update grabpl

* update grabpl

* CI: Update `grabpl` version - remove `--no-pull-enterprise` flag (#47013)

* Update grabpl version

* Sign drone

* Remove --no-pull-enterprise flag

* Sign drone

* Update grabpl

* update drone, cherry-pick some ci updates

* update PR pipeline

Co-authored-by: George Robinson <george.robinson@grafana.com>
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
Co-authored-by: Jguer <joao.guerreiro@grafana.com>
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
Co-authored-by: Dimitris Sotirakis <sotirakis.dim@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/external This PR is from external contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add elasticsearch as annotations source
6 participants