prometheus

Commit Graph

Author	SHA1	Message	Date
EarthmanT	35be8c9e25	Add azure public ip label (#5475 ) * Update Azure SD Config with Public IP label Signed-off-by: earthmant <trammell@cloudify.co>	6 years ago
Bjoern Rabenstein	a92ef68dd8	Fix staticcheck errors Not sure why they only show up now. Signed-off-by: Bjoern Rabenstein <bjoern@rabenste.in>	6 years ago
Simon Pasquier	559237cc4f	discovery/kubernetes: fix missing label sanitization (#5462 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Brian Brazil	8ff6938fa4	Update dependencies. (#5449 ) Including going to tsdb 0.7.0. Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>	6 years ago
Simon Pasquier	dafd1632a2	discovery/kubernetes: add present labels for labels/annotations (#5443 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	4f47806a7d	discovery/dns: fix slice with wrong length (#5432 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Kien Nguyen-Tuan	813b58367a	[OpenStack SD] Add ProjectID and UserID meta labels (#5431 ) Add extra meta labels which will be useful in the case Prometheus discovery instances from all projects. Signed-off-by: Kien Nguyen <kiennt2609@gmail.com>	6 years ago
Tariq Ibrahim	8fdfa8abea	refine error handling in prometheus (#5388 ) i) Uses the more idiomatic Wrap and Wrapf methods for creating nested errors. ii) Fixes some incorrect usages of fmt.Errorf where the error messages don't have any formatting directives. iii) Does away with the use of fmt package for errors in favour of pkg/errors Signed-off-by: tariqibrahim <tariq181290@gmail.com>	6 years ago
Simon Pasquier	782d00059a	discovery: factorize for SD based on refresh (#5381 ) * discovery: factorize for SD based on refresh Signed-off-by: Simon Pasquier <spasquie@redhat.com> * discovery: use common metrics for refresh Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Tariq Ibrahim	0d7104b7eb	discovery/azure:optimize iteration logic for VMScalesets, VMScalesetVMs, and VMs (#5363 ) Signed-off-by: tariqibrahim <tariq181290@gmail.com>	6 years ago
Tariq Ibrahim	5f933e99d0	discovery/azure: make local virtualMachine struct more generic by removing the go sdk field reference (#5350 ) Signed-off-by: tariqibrahim <tariq181290@gmail.com>	6 years ago
Mario Trangoni	5354ffff99	Fix some spelling issues (#5361 ) See, $ codespell -S './vendor/,./.git,./web/ui/static/vendor*' --ignore-words-list="uint,dur,ue,iff,te,wan" Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>	6 years ago
Simon Pasquier	67385f356f	discovery/openstack: pass context to the OpenStack client (#5231 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Callum Styan	83c46fd549	update Consul vendor code so that catalog.ServiceMultipleTags can be (#5151 ) Signed-off-by: Callum Styan <callumstyan@gmail.com>	6 years ago
Tariq Ibrahim	197e5ac597	docs: minor improvements to the service discovery README.md (#5296 ) i) Increased the size of the Service Discovery Readme title ii) Changed `TargetGroups` to "target groups" as it has been relocated and renamed to another package. Signed-off-by: tariqibrahim <tariq181290@gmail.com>	6 years ago
JoeWrightss	e4b88704a6	Fix misspell in manager_test.go (#5279 ) Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>	6 years ago
Simon Pasquier	1d2fc95b1c	discovery/marathon: pass context to the client (#5232 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	e60d314f43	discovery/consul: pass current context to Consul queries (#5230 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	8f578d9c6b	discovery/ec2: pass context to the client (#5234 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	4997dcb4a1	discovery/gce: pass context to the client (#5233 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	9040dddd0c	discovery/azure: pass context to the client (#5255 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	fe7a1bcfc6	discovery/triton: pass context to the client (#5235 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Björn Rabenstein	ad29221a7b	Merge pull request #5020 from erikh/upgrade-miekg-dns Upgrade miekg dns	6 years ago
Simon Pasquier	e72c875e63	config: fix Kubernetes config with empty API server (#5256 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Nguyen Hai Truong	aed9ea144a	Remove duplicated words in comments Although it is spelling mistakes, it might make an affects while reading. Co-Authored-By: Kim Bao Long longkb@vn.fujitsu.com Signed-off-by: Nguyen Hai Truong <truongnh@vn.fujitsu.com>	6 years ago
Simon Pasquier	c8a1a5a93c	discovery/kubernetes: fix support for password_file and bearer_token_file (#5211 ) * discovery/kubernetes: fix support for password_file Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Create and pass custom RoundTripper to Kubernetes client Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Use inline HTTPClientConfig Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Erik Hollensbe	be3c082539	discovery/dns/dns.go: fix handling of truncated dns records https://github.com/miekg/dns/pull/815 goes into the detail, but more or less the existing solution was no longer supported and needed to be rewritten to support the new versions of the library. miekg additionally claims this is more correct in the ticket. Signed-off-by: Erik Hollensbe <github@hollensbe.org>	6 years ago
Simon Pasquier	f9462d5d44	discovery/consul: pass current context to Consul queries Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
JoeWrightss	4cb6c202ff	Fix fmt.Errorf error message (#5199 ) Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>	6 years ago
tariqibrahim	b173de0c26	fix ineffectual assignment in dns.go Signed-off-by: tariqibrahim <tariq181290@gmail.com>	6 years ago
Jannick Fahlbusch ฏ๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎	63f375e80a	[FIX] Azure DS: Return error when request failed (#4719 ) This fixes the issue that the error is swallowed when the request failed. Signed-off-by: Jannick Fahlbusch <git@jf-projects.de>	6 years ago
Tariq Ibrahim	f4275d2352	Use the latest versions of azure go sdk and go-autorest (#5015 ) Signed-off-by: tariqibrahim <tariq181290@gmail.com>	6 years ago
Tariq Ibrahim	bfcdba211f	remove the prepended watch reactor from the fake k8s client (#5140 ) Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>	6 years ago
Simon Pasquier	68e4c211f2	discovery/azure: more robust handling of go routines (#5106 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Matt Layher	302148fd69	*: apply gofmt -s Signed-off-by: Matt Layher <mdlayher@gmail.com>	6 years ago
Simon Pasquier	22a1def98d	Merge pull request #5099 from prometheus/release-2.6 Merge release-2.6 to master	6 years ago
tommarute	9922c35a23	marathon-sd - use Tasks.Ports instead of PortDefinitions.Ports if RequirePorts is false (#5022 ) (#5026 ) Signed-off-by: tommarute <tommarute@gmail.com>	6 years ago
Sylvain Rabot	d9f4a8c95f	sd: Fix stuck Azure service discovery (#5088 ) Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>	6 years ago
Kevin Bulebush	718344434c	openstack_sd: Supporting application credential for authentication. (#4968 ) * openstack_sd: Support application credentials for authentication. Updated gophercloud Signed-off-by: Kevin Bulebush <kmbulebu@gmail.com>	6 years ago
Frederic Branczyk	e9ae0b5a1b	Merge pull request #4927 from tariq1890/update_k8s update client-go to v10.0.0 and other k8s deps to v1.13.1	6 years ago
Fabian Reinartz	ca93c8e19b	Merge pull request #4969 from prometheus/azuresubid Add Azure tenant and subscription ID labels	6 years ago
Simon Pasquier	f678e27eb6	: use latest release of staticcheck (#5057 ) : use latest release of staticcheck It also fixes a couple of things in the code flagged by the additional checks. Signed-off-by: Simon Pasquier <spasquie@redhat.com> Use official release of staticcheck Also run 'go list' before staticcheck to avoid failures when downloading packages. Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
tariqibrahim	aa94efe4b5	Merge branch 'master' of https://github.com/prometheus/prometheus into update_k8s	6 years ago
Fabian Reinartz	7a41038695	Add Azure tenant and subscription ID labels Signed-off-by: Fabian Reinartz <freinartz@google.com>	6 years ago
Lv Jiawei	ad22389218	Add ingress in UnmarshalYAML and init (#5035 ) Both UnmarshalYAML and init lacks the role type ingress. Signed-off-by: MIBc <lvjiawei@cmss.chinamobile.com>	6 years ago
tariqibrahim	122b47caa0	address review comment in client_metrics Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>	6 years ago
tariqibrahim	1e4e4c46ba	Merge branch 'master' of https://github.com/prometheus/prometheus into update_k8s Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>	6 years ago
Ilya Gladyshev	922c17e119	added name label to all discovery metrics (#5002 ) Signed-off-by: Ilya Gladyshev <ilya.v.gladyshev@gmail.com>	6 years ago
Erik Hollensbe	b94eea482c	discovery/gce: oauth2.NoContext is deprecated, replace with context.Background() (#5024 ) * vendor update * discovery/gce: oauth2.NoContext is deprecated, replace with context.Background() Signed-off-by: Erik Hollensbe <github@hollensbe.org>	6 years ago
Marcel D. Juhnke	c7d83b2b6a	discovery: add support for Managed Identity authentication in Azure SD (#4590 ) Signed-off-by: Marcel Juhnke <marrat@marrat.de>	6 years ago
tariqibrahim	0d4b6e4e66	address review comments Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>	6 years ago
Tariq Ibrahim	de6f3b6af7	expose kubernetes service cluster ip (#4940 ) Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com> Signed-off-by: tariqibrahim <tariq181290@gmail.com>	6 years ago
JoeWrightss	e8be31eed9	Fixs typo: 'possibliy' to 'possibly' (#4974 ) Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>	6 years ago
Samuel Alfageme	240321acee	Add taggedAddress to the labels in ConsulSD (#5001 ) Useful when multiple (tagged) addresses for a node are exposed on the catalog API Ref. https://www.consul.io/api/catalog.html#taggedaddresses Signed-off-by: Samuel Alfageme <samuel@alfage.me>	6 years ago
Tariq Ibrahim	e3bdc463fa	Revert "add logic to check if an azure VM is deallocated or not (#4908 )" (#4980 ) This reverts commit `61cf4365` Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>	6 years ago
tariqibrahim	1fd438ed2b	rebase and resolve merge conflicts Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>	6 years ago
tariqibrahim	412ca33226	update kubernetes deps to v1.13.0 Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>	6 years ago
Julius Volz	d28246e337	Fix config loading panics on nil pointer slice elements (#4942 ) Fixes https://github.com/prometheus/prometheus/issues/4902 Fixes https://github.com/prometheus/prometheus/issues/4889 Signed-off-by: Julius Volz <julius.volz@gmail.com>	6 years ago
Simon Pasquier	8b91d39c43	discovery: send empty group on empty SD config (#4819 ) * discovery: send empty group on blank SD config Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Update comments Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Add another comment Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Tariq Ibrahim	61cf4365d6	add logic to check if an azure VM is deallocated or not (#4908 ) * add logic to check if an azure VM is deallocated or not * update documentation with the new azure power state label Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>	6 years ago
Serghei Anicheev	8e659a5109	Adding private_dns_name to the list of ec2 labels which can be used i… (#4693 ) * Adding private_dns_name to the list of ec2 labels which can be used in node naming for dynamic environments Signed-off-by: Serghei Anicheev <serghei@rentalcover.com>	6 years ago
mengnan	a5d39361ab	discovery/azure: Fail hard when Azure authentication parameters are missing (#4907 ) * discovery/azure: fail hard when client_id/client_secret is empty Signed-off-by: mengnan <supernan1994@gmail.com> * discovery/azure: fail hard when authentication parameters are missing Signed-off-by: mengnan <supernan1994@gmail.com> * add unit test Signed-off-by: mengnan <supernan1994@gmail.com> * add unit test Signed-off-by: mengnan <supernan1994@gmail.com> * format code Signed-off-by: mengnan <supernan1994@gmail.com>	6 years ago
Ben Kochie	c6399296dc	Fix spelling/typos (#4921 ) * Fix spelling/typos Fix spelling/typos reported by codespell/misspell. * UK -> US spelling changes. Signed-off-by: Ben Kochie <superq@gmail.com>	6 years ago
Simon Pasquier	0bb810d126	discovery/marathon: fix leaked connections (#4915 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Timo Beckers	bea302e061	marathon-sd - use 'hostPort' member of portMapping to construct target endpoints (#4887 ) Fixes #4855 - ServicePort was wrongly used to construct an address to endpoints defined in portMappings. This was changed to HostPort. Support for obtaining auto-generated host ports was also added. Signed-off-by: Timo Beckers <timo@incline.eu>	6 years ago
Daniele Sluijters	f25a6baedb	remote: Set User-Agent header in requests (#4891 ) Currently Prometheus requests show up with a UA of Go-http-client/1.1 which isn't super helpful. Though the X-Prometheus-Remote-* headers exist they need to be explicitly configured when logging the request in order to be able to deduce this is a request originating from Prometheus. By setting the header we remove this ambiguity and make default server logs just a bit more useful. This also updates a few other places to consistently capitalize the 'P' in the user agent, as well as ensure we set a UA to begin with. Signed-off-by: Daniele Sluijters <daenney@users.noreply.github.com>	6 years ago
Sylvain Rabot	1fd3b33dcd	Prevent Azure SD panic (fix #4779 ) (#4867 ) Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>	6 years ago
Bryan Boreham	cf37e1feb4	Add __meta_kubernetes_pod_phase label in discovery (#4824 ) This lets you add a relabel rule to drop scrapes for pods which are not running. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	6 years ago
Silvio Gissi	6100f160ad	EC2 Platform meta label (#4663 ) Set __meta_ec2_platform label with the instance platform string. Set to 'windows' on Windows servers and absent otherwise. Signed-off-by: Silvio Gissi <silvio@gissilabs.com>	6 years ago
Goutham Veeramachaneni	f988af7235	Revert #4586 (#4766 ) This breaks people if they are depending on the contents of __address__ label. Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>	6 years ago
Simon Pasquier	a30348f1a4	discovery: add config label to discovered targets metric (#4753 ) * discovery: add labels to discovered targets metric Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	5824d6902d	openstack: fix client when using env variables (#4734 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Kien Nguyen-Tuan	9c5370fdfe	Support discover instances from all projects (#4682 ) By default, OpenStack SD only queries for instances from specified project. To discover instances from other projects, users have to add more openstack_sd_configs for each project. This patch adds `all_tenants` <bool> options to openstack_sd_configs. For example: - job_name: 'openstack_all_instances' openstack_sd_configs: - role: instance region: RegionOne identity_endpoint: http://<identity_server>/identity/v3 username: <username> password: <super_secret_password> domain_name: Default all_tenants: true Co-authored-by: Kien Nguyen <kiennt2609@gmail.com> Signed-off-by: dmatosl <danielmatos.lima@gmail.com>	6 years ago
Simon Pasquier	c4a6acfb1e	: move to go 1.11 (#4626 ) : move to go 1.11 Signed-off-by: Simon Pasquier <spasquie@redhat.com> Reduce number of places where we specify the Go version Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Goutham Veeramachaneni	ffb7f829ec	Merge pull request #4730 from prometheus/release-2.4 Release 2.4	6 years ago
Simon Pasquier	3e6b9d43c3	Merge pull request #4720 from teresy/redundant-nil-check-slice Remove redundant nil check	6 years ago
Rijnard van Tonder	9d102e3bff	The nil check before the range loop is redundant Signed-off-by: Rijnard van Tonder <hi.teresy@gmail.com>	6 years ago
Richard Kiene	b537f6047a	Add ability to filter triton_sd targets by pre-defined groups (#4701 ) Additionally, add triton groups metadata to the discovery reponse and correct a documentation error regarding the triton server id metadata. Signed-off-by: Richard Kiene <richard.kiene@joyent.com>	6 years ago
Simon Pasquier	a2a78d0a09	discovery/openstack: discover all interfaces (#4649 ) * discovery/openstack: discover all interfaces * Add address pool label Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	e1e2821cca	Merge pull request #4654 from simonpasquier/openstack-tls discovery/openstack: support tls_config	6 years ago
Jannick Fahlbusch ฏ๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎	f78e59577b	[FIX] EC2 DS: Check for existence of OwnerID (#4672 ) Commit `1c89984` introduced the ability to expose the owner of the instance. However, this breaks Prometheus if there is no OwnerID in the reservation (Eg. if you are using a private EC2-API introduced by #4333) Signed-off-by: Jannick Fahlbusch <git@jf-projects.de>	6 years ago
Simon Pasquier	657199af22	Address Krasi comments Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	5df757fdd4	zookeeper: fix panic Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	365931ea83	discovery: add metrics + send updates from one goroutine only The added metrics are: * prometheus_sd_discovered_targets * prometheus_sd_received_updates_total * prometheus_sd_updates_delayed_total * prometheus_sd_updates_total Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	f2d43af820	Merge pull request #4582 from simonpasquier/add-discovery-tests discovery: add more tests	6 years ago
Simon Pasquier	ff08c40091	discovery/openstack: support tls_config Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Frederic Branczyk	b75ec7e6ef	Merge pull request #4458 from FUSAKLA/k8s-sd-add-metrics feat: added more k8s SD metrics	6 years ago
Timo Beckers	1c9fbd65c4	marathon-sd - change port gathering strategy, support for container networking (#4499 ) * marathon-sd - change port gathering strategy, add support for container networking - removed unnecessary error check on HTTPClientConfig.Validate() - renamed PortDefinitions and PortMappings to PortDefinition and PortMapping respectively - extended data model for extra parsed fields from Marathon json - support container networking on Marathon 1.5+ (target Task.IPAddresses.x.Address) - expanded test suite to cover all new cases - test: cancel context when reading from doneCh before returning from function - test: split test suite into Ports/PortMappings/PortDefinitions Signed-off-by: Timo Beckers <timo@incline.eu>	6 years ago
Martin Chodur	f2d037133e	feat: added more k8s SD metrics Signed-off-by: Martin Chodur <m.chodur@seznam.cz>	6 years ago
Camille Janicki	b035ea0ea9	Change discovery subpackages to not use testify in tests (#4612 ) * Change discovery subpackages to not use testify in tests Signed-off-by: Camille Janicki <camille.janicki@gmail.com> * Remove testify suite from vendor dir Signed-off-by: Camille Janicki <camille.janicki@gmail.com>	6 years ago
Simon Pasquier	128ff546b8	config: add test for OpenStack SD (#4594 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Tom Wilkie	e3d36f4802	Don't import testing from non-test code. (#4595 ) Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>	6 years ago
Bryan Boreham	968f657eaa	Stop removing the final dot from rooted DNS names (#4586 ) Removing a final dot changes the meaning of the name and can cause extra DNS lookups as the resolver traverses its search path. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	6 years ago
Simon Pasquier	e7cee1b5ba	Remove tests redundant with TestTargetUpdatesOrder Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	7dc3f11306	WIP discovery: refactor TestTargetUpdatesOrder Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	8fd891bf3f	Speed up tests that were still using the 5s timeout Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	8289501420	Address krasi's comments Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	1cee5b5b06	Don't multiple the interval value by 1ms in the mock Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	4900405d2f	Refactor TestCoordinationWithReceiver() to work with any Discoverer Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	0798f14e02	Add TestCoordinationWithEmptyProvider Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago

1 2 3 4 5 ...

341 Commits (e9ede5175370c6ddbf6e95663a13ae4fb4f6b197)