[ENG-11604] es6 cleanup (again) (#11817)

* chore: remove all es6-using code (again)

* fix: trailing space

Author: aaxelb

.github/workflows/test-build.yml

@@ -48,15 +48,6 @@ jobs:
           --health-interval 10s
           --health-timeout 30s
           --health-retries 5
-      elasticsearch6: &ES6_SERVICE
-        image: elasticsearch:6.8.23
-        ports:
-          - 9201:9200
-        options: >-
-          --health-cmd "curl -sf http://localhost:9200/_cluster/health?wait_for_status=yellow&timeout=30s"
-          --health-interval 10s
-          --health-timeout 30s
-          --health-retries 5
       postgres: &POSTGRES_SERVICE
         image: postgres
         env:
@@ -76,7 +67,6 @@ jobs:
       run: poetry run python3 -m invoke test-ci-addons --junit
       env:
         ELASTIC8_URI: http://localhost:9202
-        ELASTIC6_URI: http://localhost:9201
     - name: Upload report
       if: (success() || failure())    # run this step even if previous step failed
       uses: ./.github/actions/gen-report
@@ -104,7 +94,6 @@ jobs:
       checks: write
     services:
       elasticsearch8: *ES8_SERVICE
-      elasticsearch6: *ES6_SERVICE
       postgres: *POSTGRES_SERVICE
     steps:
       - uses: actions/checkout@v6
@@ -115,7 +104,6 @@ jobs:
         run: poetry run python3 -m invoke test-ci-api1-and-js --junit
         env:
           ELASTIC8_URI: http://localhost:9202
-          ELASTIC6_URI: http://localhost:9201
       - name: Upload report
         if: (success() || failure())    # run this step even if previous step failed
         uses: ./.github/actions/gen-report
@@ -127,7 +115,6 @@ jobs:
       checks: write
     services:
       elasticsearch8: *ES8_SERVICE
-      elasticsearch6: *ES6_SERVICE
       postgres: *POSTGRES_SERVICE
     steps:
     - uses: actions/checkout@v6
@@ -136,7 +123,6 @@ jobs:
       run: poetry run python3 -m invoke test-ci-api2 --junit
       env:
         ELASTIC8_URI: http://localhost:9202
-        ELASTIC6_URI: http://localhost:9201
     - name: Upload report
       if: (success() || failure())    # run this step even if previous step failed
       uses: ./.github/actions/gen-report
@@ -155,7 +141,6 @@ jobs:
       run: poetry run python3 -m invoke test-ci-api3-and-osf --junit
       env:
         ELASTIC8_URI: http://localhost:9202
-        ELASTIC6_URI: http://localhost:9201
     - name: Upload report
       if: (success() || failure())    # run this step even if previous step failed
       uses: ./.github/actions/gen-report

admin/management/urls.py

@@ -1,4 +1,4 @@
-from django.urls import re_path, path
+from django.urls import re_path
 
 from admin.management import views
 
@@ -22,7 +22,6 @@
             name='sync_notification_templates'),
     re_path(r'^remove_orcid_from_user_social', views.RemoveOrcidFromUserSocial.as_view(),
             name='remove_orcid_from_user_social'),
-    path('migrate_osfmetrics_fix_6to8', views.MigrateOsfmetricsFix6to8.as_view(), name='migrate_osfmetrics_fix_6to8'),
     re_path(r'^migrate_funder_names_to_ror', views.MigrateFunderNamesToRor.as_view(),
             name='migrate_funder_names_to_ror'),
 ]

admin/management/views.py

@@ -217,21 +217,6 @@ def post(self, request):
         return redirect(reverse('management:commands'))
 
 
-class MigrateOsfmetricsFix6to8(ManagementCommandPermissionView):
-    def post(self, request):
-        _command_kwargs = {
-            'no_color': True,
-            'no_counts': request.POST.get('no_counts'),
-            'delete_es8_usage_reports': request.POST.get('delete_es8_usage_reports'),
-            'start': request.POST.get('start'),
-        }
-        _out_io = StringIO()
-        call_command('migrate_osfmetrics_fix_6to8', **_command_kwargs, stdout=_out_io)
-        for _line in _out_io.getvalue().split('\n'):
-            messages.info(request, _line)
-        return redirect(reverse('management:commands'))
-
-
 class MigrateFunderNamesToRor(ManagementCommandPermissionView):
 
     def post(self, request):

admin/templates/management/commands.html

@@ -200,23 +200,6 @@ <h4><u>Remove existing orcid info from user social</u></h4>
                     </nav>
                 </form>
             </section>
-            <section>
-                <h4><u>migrate osf-metrics (fix) 6to8</u></h4>
-                <p>
-                    view progress of the osf-metrics migration (fixup) from elastic6 to elastic8 (or start it)
-                </p>
-                <form method="post"
-                      action="{% url 'management:migrate_osfmetrics_fix_6to8'%}"
-                      style="display: flex; flex-direction: column;">
-                    {% csrf_token %}
-                    <label><input type="checkbox" name="no_counts"> no counts</label>
-                    <label><input type="checkbox" name="delete_es8_usage_reports"> delete es8 usage reports (caution)</label>
-                    <label><input type="checkbox" name="start"> start tasks (caution)</label>
-                    <nav>
-                        <input class="btn btn-success" type="submit" value="Run" />
-                    </nav>
-                </form>
-            </section>
             <section>
                 <h4><u>Update ROR funder names to be consistent and proper.</u></h4>
                 <p>

api/base/settings/defaults.py

@@ -322,12 +322,6 @@
 
 # django-elasticsearch-metrics
 DJELME_BACKENDS = {
-    'osfmetrics_es6': {
-        'elasticsearch_metrics.imps.elastic6': {
-            'hosts': osf_settings.ELASTIC6_URI,
-            'retry_on_timeout': True,
-        },
-    },
     'osfmetrics_es8': {
         'elasticsearch_metrics.imps.elastic8': {
             # passthru kwargs to elasticsearch8 connection constructor
@@ -345,7 +339,6 @@
     },
 }
 OSF_USAGEEVENT_EXPIRATION_DAYS = 90
-ELASTICSEARCH_METRICS_DATE_FORMAT = '%Y'
 MONTHLY_USAGE_REPORT_EPOCH = '2026-05'  # cannot create monthly usage reports before this point
 
 WAFFLE_CACHE_NAME = 'waffle_cache'

docker-compose.yml

@@ -13,8 +13,6 @@ volumes:
     external: false
   elasticsearch8_data_vol:
     external: false
-  elasticsearch6_data_vol:
-    external: false
   rabbitmq_vol:
     external: false
   preprints_dist_vol:
@@ -85,22 +83,6 @@ services:
       retries: 30
     stdin_open: true
 
-  # Temporary: Remove when done with es6
-  elasticsearch6:
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.3.1
-    environment:
-      - ES_JAVA_OPTS=-Xms512m -Xmx512m  # reduce memory usage
-    ports:
-      - 9201:9200
-    volumes:
-      - elasticsearch6_data_vol:/usr/share/elasticsearch/data
-    healthcheck:
-      start_period: 15s
-      test: curl -s http://localhost:9200/_cluster/health | grep -vq '"status":"red"'
-      interval: 10s
-      retries: 30
-    stdin_open: true
-
   postgres:
     image: postgres:15.4
     command: